refinerycms 0.9.5.13 → 0.9.5.14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (294) hide show
  1. data/Rakefile +6 -1
  2. data/app/controllers/admin/base_controller.rb +2 -2
  3. data/app/controllers/application.rb +1 -1
  4. data/app/controllers/application_controller.rb +2 -2
  5. data/app/helpers/application_helper.rb +2 -2
  6. data/config/environment.rb +6 -6
  7. data/config/environments/development.rb +1 -1
  8. data/config/initializers/inflections.rb +1 -1
  9. data/config/preinitializer.rb +3 -3
  10. data/config/routes.rb +5 -5
  11. data/db/migrate/20091109012126_add_missing_indexes.rb +4 -4
  12. data/db/schema.rb +1 -2
  13. data/db/seeds.rb +35 -35
  14. data/lib/refinery_initializer.rb +2 -2
  15. data/public/404.html +15 -15
  16. data/public/422.html +8 -8
  17. data/public/500.html +8 -8
  18. data/public/images/refinery/logo-large.png +0 -0
  19. data/public/images/refinery/logo-medium.png +0 -0
  20. data/public/images/refinery/logo-small-medium.png +0 -0
  21. data/public/images/refinery/logo-small.png +0 -0
  22. data/public/images/refinery/resolve_digital_footer_logo.png +0 -0
  23. data/public/javascripts/builder.js +97 -97
  24. data/public/javascripts/controls.js +655 -655
  25. data/public/javascripts/dragdrop.js +936 -936
  26. data/public/javascripts/effects.js +713 -713
  27. data/public/javascripts/jquery/GPL-LICENSE.txt +96 -96
  28. data/public/javascripts/jquery/jquery.js +168 -168
  29. data/public/javascripts/lightbox.js +397 -397
  30. data/public/javascripts/livepipe.js +146 -146
  31. data/public/javascripts/prototype.js +2996 -2996
  32. data/public/javascripts/refinery/admin.js +20 -20
  33. data/public/javascripts/refinery/boot_wym.js +110 -110
  34. data/public/javascripts/refinery/dialog.js +1 -1
  35. data/public/javascripts/refinery/parse_url.js +27 -27
  36. data/public/javascripts/refinery/prototype.enhancements.js +17 -17
  37. data/public/javascripts/refinery/tooltips.js +34 -34
  38. data/public/javascripts/scriptaculous.js +22 -22
  39. data/public/javascripts/slider.js +239 -239
  40. data/public/javascripts/tabs.js +130 -130
  41. data/public/javascripts/thickbox.js +23 -23
  42. data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +23 -23
  43. data/public/javascripts/wymeditor/lang/ca.js +42 -42
  44. data/public/javascripts/wymeditor/lang/cs.js +42 -42
  45. data/public/javascripts/wymeditor/lang/de.js +42 -42
  46. data/public/javascripts/wymeditor/lang/en.js +44 -44
  47. data/public/javascripts/wymeditor/lang/es.js +42 -42
  48. data/public/javascripts/wymeditor/lang/fa.js +42 -42
  49. data/public/javascripts/wymeditor/lang/fr.js +42 -42
  50. data/public/javascripts/wymeditor/lang/he.js +42 -42
  51. data/public/javascripts/wymeditor/lang/hu.js +42 -42
  52. data/public/javascripts/wymeditor/lang/it.js +42 -42
  53. data/public/javascripts/wymeditor/lang/nb.js +42 -42
  54. data/public/javascripts/wymeditor/lang/nl.js +42 -42
  55. data/public/javascripts/wymeditor/lang/nn.js +42 -42
  56. data/public/javascripts/wymeditor/lang/pl.js +42 -42
  57. data/public/javascripts/wymeditor/lang/pt-br.js +42 -42
  58. data/public/javascripts/wymeditor/lang/pt.js +42 -42
  59. data/public/javascripts/wymeditor/lang/ru.js +42 -42
  60. data/public/javascripts/wymeditor/lang/sv.js +42 -42
  61. data/public/javascripts/wymeditor/lang/tr.js +42 -42
  62. data/public/javascripts/wymeditor/lang/zh_cn.js +44 -44
  63. data/public/javascripts/wymeditor/skins/refinery/skin.js +31 -31
  64. data/public/stylesheets/application.css +3 -3
  65. data/public/stylesheets/formatting.css +3 -3
  66. data/public/stylesheets/home.css +2 -2
  67. data/public/stylesheets/lightbox.css +1 -1
  68. data/public/stylesheets/refinery/application.css +13 -13
  69. data/public/stylesheets/refinery/formatting.css +3 -3
  70. data/public/stylesheets/refinery/refinery.css +49 -44
  71. data/public/stylesheets/refinery/theme.css +1 -1
  72. data/public/stylesheets/refinery/thickbox.css +4 -4
  73. data/public/stylesheets/wymeditor/skins/refinery/skin.css +115 -115
  74. data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css +66 -66
  75. data/public/wymeditor/GPL-license.txt +96 -96
  76. data/script/performance/benchmarker +3 -0
  77. data/vendor/plugins/acts_as_indexed/lib/acts_as_indexed.rb +12 -12
  78. data/vendor/plugins/acts_as_indexed/lib/search_atom.rb +7 -7
  79. data/vendor/plugins/acts_as_indexed/lib/search_index.rb +7 -7
  80. data/vendor/plugins/acts_as_indexed/lib/will_paginate_search.rb +1 -1
  81. data/vendor/plugins/acts_as_indexed/test/abstract_unit.rb +5 -5
  82. data/vendor/plugins/acts_as_indexed/test/acts_as_indexed_test.rb +2 -2
  83. data/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb +140 -140
  84. data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb +18 -18
  85. data/vendor/plugins/attachment_fu/install.rb +1 -1
  86. data/vendor/plugins/attachment_fu/lib/geometry.rb +2 -2
  87. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb +3 -3
  88. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb +4 -4
  89. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb +11 -11
  90. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb +7 -7
  91. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb +5 -5
  92. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb +4 -4
  93. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb +1 -1
  94. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb +11 -11
  95. data/vendor/plugins/attachment_fu/test/backends/db_file_test.rb +2 -2
  96. data/vendor/plugins/attachment_fu/test/backends/file_system_test.rb +24 -24
  97. data/vendor/plugins/attachment_fu/test/backends/remote/cloudfiles_test.rb +14 -14
  98. data/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb +7 -7
  99. data/vendor/plugins/attachment_fu/test/base_attachment_tests.rb +10 -10
  100. data/vendor/plugins/attachment_fu/test/basic_test.rb +10 -10
  101. data/vendor/plugins/attachment_fu/test/extra_attachment_test.rb +9 -9
  102. data/vendor/plugins/attachment_fu/test/fixtures/attachment.rb +10 -10
  103. data/vendor/plugins/attachment_fu/test/geometry_test.rb +12 -12
  104. data/vendor/plugins/attachment_fu/test/processors/core_image_test.rb +6 -6
  105. data/vendor/plugins/attachment_fu/test/processors/gd2_test.rb +4 -4
  106. data/vendor/plugins/attachment_fu/test/processors/image_science_test.rb +4 -4
  107. data/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb +13 -13
  108. data/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb +33 -33
  109. data/vendor/plugins/attachment_fu/test/schema.rb +14 -14
  110. data/vendor/plugins/attachment_fu/test/test_helper.rb +11 -11
  111. data/vendor/plugins/attachment_fu/test/validation_test.rb +7 -7
  112. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb +7 -7
  113. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb +7 -7
  114. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb +5 -5
  115. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb +7 -7
  116. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb +5 -5
  117. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb +6 -6
  118. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb +16 -16
  119. data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb +30 -30
  120. data/vendor/plugins/authentication/app/controllers/sessions_controller.rb +4 -4
  121. data/vendor/plugins/authentication/app/controllers/users_controller.rb +7 -7
  122. data/vendor/plugins/authentication/app/helpers/sessions_helper.rb +1 -1
  123. data/vendor/plugins/authentication/app/helpers/users_helper.rb +1 -1
  124. data/vendor/plugins/authentication/app/models/user.rb +56 -56
  125. data/vendor/plugins/authentication/app/models/user_mailer.rb +6 -6
  126. data/vendor/plugins/authentication/app/models/user_observer.rb +2 -2
  127. data/vendor/plugins/authentication/app/models/user_plugin.rb +4 -4
  128. data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb +36 -36
  129. data/vendor/plugins/authentication/app/views/admin/users/edit.html.erb +1 -1
  130. data/vendor/plugins/authentication/app/views/admin/users/index.html.erb +1 -1
  131. data/vendor/plugins/authentication/app/views/admin/users/new.html.erb +1 -1
  132. data/vendor/plugins/authentication/app/views/sessions/new.html.erb +19 -19
  133. data/vendor/plugins/authentication/app/views/user_mailer/activation.html.erb +1 -1
  134. data/vendor/plugins/authentication/app/views/user_mailer/signup_notification.html.erb +1 -1
  135. data/vendor/plugins/authentication/app/views/users/new.html.erb +3 -3
  136. data/vendor/plugins/authentication/config/routes.rb +1 -1
  137. data/vendor/plugins/authentication/init.rb +5 -5
  138. data/vendor/plugins/authentication/lib/authenticated_system.rb +1 -1
  139. data/vendor/plugins/authentication/test/functional/sessions_controller_test.rb +2 -2
  140. data/vendor/plugins/authentication/test/functional/users_controller_test.rb +3 -3
  141. data/vendor/plugins/authentication/test/test_helper.rb +1 -1
  142. data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb +1 -1
  143. data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb +1 -1
  144. data/vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb +10 -10
  145. data/vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb +30 -30
  146. data/vendor/plugins/dashboard/config/routes.rb +2 -2
  147. data/vendor/plugins/dashboard/init.rb +6 -6
  148. data/vendor/plugins/images/app/controllers/admin/images_controller.rb +28 -28
  149. data/vendor/plugins/images/app/helpers/admin/images_helper.rb +14 -14
  150. data/vendor/plugins/images/app/models/image.rb +11 -11
  151. data/vendor/plugins/images/app/views/admin/images/_form.html.erb +21 -21
  152. data/vendor/plugins/images/app/views/admin/images/_grid_view.html.erb +13 -13
  153. data/vendor/plugins/images/app/views/admin/images/_list_view.html.erb +1 -1
  154. data/vendor/plugins/images/app/views/admin/images/_list_view_image.html.erb +2 -2
  155. data/vendor/plugins/images/app/views/admin/images/edit.html.erb +1 -1
  156. data/vendor/plugins/images/app/views/admin/images/index.html.erb +15 -15
  157. data/vendor/plugins/images/app/views/admin/images/insert.html.erb +91 -91
  158. data/vendor/plugins/images/app/views/admin/images/new.html.erb +1 -1
  159. data/vendor/plugins/images/config/routes.rb +2 -2
  160. data/vendor/plugins/images/init.rb +7 -7
  161. data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb +4 -4
  162. data/vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb +5 -5
  163. data/vendor/plugins/inquiries/app/controllers/inquiries_controller.rb +3 -3
  164. data/vendor/plugins/inquiries/app/helpers/inquiries_helper.rb +3 -3
  165. data/vendor/plugins/inquiries/app/models/inquiry.rb +6 -6
  166. data/vendor/plugins/inquiries/app/models/inquiry_mailer.rb +1 -1
  167. data/vendor/plugins/inquiries/app/models/inquiry_setting.rb +3 -3
  168. data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb +19 -19
  169. data/vendor/plugins/inquiries/app/views/admin/inquiries/index.html.erb +27 -27
  170. data/vendor/plugins/inquiries/app/views/admin/inquiries/show.html.erb +59 -59
  171. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb +44 -44
  172. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_notification_recipients_form.html.erb +15 -15
  173. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/edit.html.erb +3 -3
  174. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb +29 -29
  175. data/vendor/plugins/inquiries/app/views/inquiries/new.html.erb +32 -32
  176. data/vendor/plugins/inquiries/app/views/inquiries/thank_you.html.erb +8 -8
  177. data/vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb +1 -1
  178. data/vendor/plugins/inquiries/app/views/inquiry_mailer/notification.html.erb +1 -1
  179. data/vendor/plugins/inquiries/config/routes.rb +3 -3
  180. data/vendor/plugins/inquiries/init.rb +10 -10
  181. data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb +3 -3
  182. data/vendor/plugins/news/app/controllers/news_items_controller.rb +2 -2
  183. data/vendor/plugins/news/app/models/news_item.rb +5 -5
  184. data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb +16 -16
  185. data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb +14 -14
  186. data/vendor/plugins/news/app/views/admin/news_items/edit.html.erb +1 -1
  187. data/vendor/plugins/news/app/views/admin/news_items/index.html.erb +25 -25
  188. data/vendor/plugins/news/app/views/admin/news_items/new.html.erb +1 -1
  189. data/vendor/plugins/news/app/views/news_items/_recent_posts.html.erb +6 -6
  190. data/vendor/plugins/news/app/views/news_items/index.html.erb +20 -20
  191. data/vendor/plugins/news/app/views/news_items/show.html.erb +16 -16
  192. data/vendor/plugins/news/config/routes.rb +3 -3
  193. data/vendor/plugins/news/init.rb +7 -7
  194. data/vendor/plugins/pages/app/controllers/admin/page_dialogs_controller.rb +10 -10
  195. data/vendor/plugins/pages/app/controllers/admin/page_parts_controller.rb +4 -4
  196. data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb +4 -4
  197. data/vendor/plugins/pages/app/controllers/pages_controller.rb +3 -3
  198. data/vendor/plugins/pages/app/helpers/pages_helper.rb +1 -1
  199. data/vendor/plugins/pages/app/models/page.rb +95 -95
  200. data/vendor/plugins/pages/app/models/page_part.rb +5 -5
  201. data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb +1 -1
  202. data/vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb +222 -222
  203. data/vendor/plugins/pages/app/views/admin/pages/_form.html.erb +232 -232
  204. data/vendor/plugins/pages/app/views/admin/pages/_list.html.erb +26 -26
  205. data/vendor/plugins/pages/app/views/admin/pages/_page_part_field.html.erb +3 -3
  206. data/vendor/plugins/pages/app/views/admin/pages/_sortable_list.html.erb +2 -2
  207. data/vendor/plugins/pages/app/views/admin/pages/edit.html.erb +1 -1
  208. data/vendor/plugins/pages/app/views/admin/pages/index.html.erb +37 -37
  209. data/vendor/plugins/pages/app/views/admin/pages/new.html.erb +1 -1
  210. data/vendor/plugins/pages/app/views/pages/home.html.erb +8 -8
  211. data/vendor/plugins/pages/app/views/pages/show.html.erb +11 -11
  212. data/vendor/plugins/pages/config/routes.rb +5 -5
  213. data/vendor/plugins/pages/init.rb +7 -7
  214. data/vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb +7 -7
  215. data/vendor/plugins/refinery/app/views/admin/_head.html.erb +30 -30
  216. data/vendor/plugins/refinery/app/views/admin/_menu.html.erb +61 -61
  217. data/vendor/plugins/refinery/app/views/layouts/admin.html.erb +32 -32
  218. data/vendor/plugins/refinery/app/views/layouts/application.html.erb +28 -28
  219. data/vendor/plugins/refinery/app/views/shared/_footer.html.erb +4 -4
  220. data/vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb +11 -11
  221. data/vendor/plugins/refinery/app/views/shared/_header.html.erb +3 -3
  222. data/vendor/plugins/refinery/app/views/shared/_ie6check.html.erb +1 -1
  223. data/vendor/plugins/refinery/app/views/shared/_menu.html.erb +14 -14
  224. data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb +21 -21
  225. data/vendor/plugins/refinery/app/views/shared/_message.html.erb +8 -8
  226. data/vendor/plugins/refinery/app/views/shared/_submenu.html.erb +2 -2
  227. data/vendor/plugins/refinery/app/views/shared/_submenu_branch.html.erb +7 -7
  228. data/vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb +41 -41
  229. data/vendor/plugins/refinery/app/views/shared/admin/_error_messages_for.html.erb +1 -1
  230. data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb +13 -13
  231. data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb +31 -31
  232. data/vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb +65 -65
  233. data/vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb +16 -16
  234. data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb +5 -5
  235. data/vendor/plugins/refinery/app/views/shared/admin/_sortable_list.html.erb +8 -8
  236. data/vendor/plugins/refinery/app/views/welcome.html.erb +1 -1
  237. data/vendor/plugins/refinery/app/views/wymiframe.html.erb +6 -6
  238. data/vendor/plugins/refinery/config/routes.rb +5 -5
  239. data/vendor/plugins/refinery/init.rb +8 -8
  240. data/vendor/plugins/refinery/lib/crud.rb +17 -17
  241. data/vendor/plugins/refinery/lib/generators/refinery/install.rb +1 -1
  242. data/vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb +17 -17
  243. data/vendor/plugins/refinery/lib/generators/refinery/templates/config/routes.rb +3 -3
  244. data/vendor/plugins/refinery/lib/generators/refinery/templates/controller.rb +2 -2
  245. data/vendor/plugins/refinery/lib/generators/refinery/templates/init.rb +6 -6
  246. data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb +22 -22
  247. data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb +4 -4
  248. data/vendor/plugins/refinery/lib/generators/refinery/templates/public_controller.rb +10 -10
  249. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb +3 -3
  250. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb +15 -15
  251. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_sortable_list.html.erb +1 -1
  252. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/edit.html.erb +1 -1
  253. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb +33 -33
  254. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/new.html.erb +1 -1
  255. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/index.html.erb +14 -14
  256. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb +21 -21
  257. data/vendor/plugins/refinery/lib/indexer.rb +29 -29
  258. data/vendor/plugins/refinery/lib/refinery.rb +10 -10
  259. data/vendor/plugins/refinery/lib/refinery/activity.rb +5 -5
  260. data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb +15 -15
  261. data/vendor/plugins/refinery/lib/refinery/application_controller.rb +39 -39
  262. data/vendor/plugins/refinery/lib/refinery/application_helper.rb +69 -69
  263. data/vendor/plugins/refinery/lib/refinery/form_helpers.rb +18 -18
  264. data/vendor/plugins/refinery/lib/refinery/html_truncation_helper.rb +5 -5
  265. data/vendor/plugins/refinery/lib/refinery/initializer.rb +2 -2
  266. data/vendor/plugins/refinery/lib/refinery/link_renderer.rb +13 -13
  267. data/vendor/plugins/refinery/lib/refinery/plugin.rb +24 -24
  268. data/vendor/plugins/refinery/lib/refinery/plugins.rb +2 -2
  269. data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb +8 -8
  270. data/vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb +19 -19
  271. data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb +29 -29
  272. data/vendor/plugins/refinery_dialogs/config/routes.rb +2 -2
  273. data/vendor/plugins/refinery_dialogs/init.rb +7 -7
  274. data/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb +2 -2
  275. data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +52 -52
  276. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb +11 -11
  277. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_make_sortable.html.erb +3 -3
  278. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_refinery_setting.html.erb +12 -12
  279. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/edit.html.erb +2 -2
  280. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb +19 -19
  281. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/new.html.erb +1 -1
  282. data/vendor/plugins/refinery_settings/config/routes.rb +3 -3
  283. data/vendor/plugins/refinery_settings/init.rb +8 -8
  284. data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb +48 -48
  285. data/vendor/plugins/resources/app/models/resource.rb +12 -12
  286. data/vendor/plugins/resources/app/views/admin/resources/_form.html.erb +21 -21
  287. data/vendor/plugins/resources/app/views/admin/resources/_resource.html.erb +15 -15
  288. data/vendor/plugins/resources/app/views/admin/resources/edit.html.erb +1 -1
  289. data/vendor/plugins/resources/app/views/admin/resources/index.html.erb +19 -19
  290. data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb +86 -86
  291. data/vendor/plugins/resources/app/views/admin/resources/new.html.erb +1 -1
  292. data/vendor/plugins/resources/config/routes.rb +2 -2
  293. data/vendor/plugins/resources/init.rb +6 -6
  294. metadata +31 -23
@@ -12,13 +12,13 @@
12
12
  String.prototype.parseColor = function() {
13
13
  var color = '#';
14
14
  if (this.slice(0,4) == 'rgb(') {
15
- var cols = this.slice(4,this.length-1).split(',');
16
- var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
15
+ var cols = this.slice(4,this.length-1).split(',');
16
+ var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
17
17
  } else {
18
- if (this.slice(0,1) == '#') {
19
- if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
20
- if (this.length==7) color = this.toLowerCase();
21
- }
18
+ if (this.slice(0,1) == '#') {
19
+ if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
20
+ if (this.length==7) color = this.toLowerCase();
21
+ }
22
22
  }
23
23
  return (color.length==7 ? color : (arguments[0] || this));
24
24
  };
@@ -27,16 +27,16 @@ String.prototype.parseColor = function() {
27
27
 
28
28
  Element.collectTextNodes = function(element) {
29
29
  return $A($(element).childNodes).collect( function(node) {
30
- return (node.nodeType==3 ? node.nodeValue :
31
- (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
30
+ return (node.nodeType==3 ? node.nodeValue :
31
+ (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
32
32
  }).flatten().join('');
33
33
  };
34
34
 
35
35
  Element.collectTextNodesIgnoreClass = function(element, className) {
36
36
  return $A($(element).childNodes).collect( function(node) {
37
- return (node.nodeType==3 ? node.nodeValue :
38
- ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
39
- Element.collectTextNodesIgnoreClass(node, className) : ''));
37
+ return (node.nodeType==3 ? node.nodeValue :
38
+ ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
39
+ Element.collectTextNodesIgnoreClass(node, className) : ''));
40
40
  }).flatten().join('');
41
41
  };
42
42
 
@@ -53,10 +53,10 @@ Element.getInlineOpacity = function(element){
53
53
 
54
54
  Element.forceRerendering = function(element) {
55
55
  try {
56
- element = $(element);
57
- var n = document.createTextNode(' ');
58
- element.appendChild(n);
59
- element.removeChild(n);
56
+ element = $(element);
57
+ var n = document.createTextNode(' ');
58
+ element.appendChild(n);
59
+ element.removeChild(n);
60
60
  } catch(e) { }
61
61
  };
62
62
 
@@ -64,95 +64,95 @@ Element.forceRerendering = function(element) {
64
64
 
65
65
  var Effect = {
66
66
  _elementDoesNotExistError: {
67
- name: 'ElementDoesNotExistError',
68
- message: 'The specified DOM element does not exist, but is required for this effect to operate'
67
+ name: 'ElementDoesNotExistError',
68
+ message: 'The specified DOM element does not exist, but is required for this effect to operate'
69
69
  },
70
70
  Transitions: {
71
- linear: Prototype.K,
72
- sinoidal: function(pos) {
73
- return (-Math.cos(pos*Math.PI)/2) + .5;
74
- },
75
- reverse: function(pos) {
76
- return 1-pos;
77
- },
78
- flicker: function(pos) {
79
- var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
80
- return pos > 1 ? 1 : pos;
81
- },
82
- wobble: function(pos) {
83
- return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
84
- },
85
- pulse: function(pos, pulses) {
86
- return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
87
- },
88
- spring: function(pos) {
89
- return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
90
- },
91
- none: function(pos) {
92
- return 0;
93
- },
94
- full: function(pos) {
95
- return 1;
96
- }
71
+ linear: Prototype.K,
72
+ sinoidal: function(pos) {
73
+ return (-Math.cos(pos*Math.PI)/2) + .5;
74
+ },
75
+ reverse: function(pos) {
76
+ return 1-pos;
77
+ },
78
+ flicker: function(pos) {
79
+ var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
80
+ return pos > 1 ? 1 : pos;
81
+ },
82
+ wobble: function(pos) {
83
+ return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
84
+ },
85
+ pulse: function(pos, pulses) {
86
+ return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
87
+ },
88
+ spring: function(pos) {
89
+ return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
90
+ },
91
+ none: function(pos) {
92
+ return 0;
93
+ },
94
+ full: function(pos) {
95
+ return 1;
96
+ }
97
97
  },
98
98
  DefaultOptions: {
99
- duration: 1.0, // seconds
100
- fps: 100, // 100= assume 66fps max.
101
- sync: false, // true for combining
102
- from: 0.0,
103
- to: 1.0,
104
- delay: 0.0,
105
- queue: 'parallel'
99
+ duration: 1.0, // seconds
100
+ fps: 100, // 100= assume 66fps max.
101
+ sync: false, // true for combining
102
+ from: 0.0,
103
+ to: 1.0,
104
+ delay: 0.0,
105
+ queue: 'parallel'
106
106
  },
107
107
  tagifyText: function(element) {
108
- var tagifyStyle = 'position:relative';
109
- if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
108
+ var tagifyStyle = 'position:relative';
109
+ if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
110
110
 
111
- element = $(element);
112
- $A(element.childNodes).each( function(child) {
113
- if (child.nodeType==3) {
114
- child.nodeValue.toArray().each( function(character) {
115
- element.insertBefore(
116
- new Element('span', {style: tagifyStyle}).update(
117
- character == ' ' ? String.fromCharCode(160) : character),
118
- child);
119
- });
120
- Element.remove(child);
121
- }
111
+ element = $(element);
112
+ $A(element.childNodes).each( function(child) {
113
+ if (child.nodeType==3) {
114
+ child.nodeValue.toArray().each( function(character) {
115
+ element.insertBefore(
116
+ new Element('span', {style: tagifyStyle}).update(
117
+ character == ' ' ? String.fromCharCode(160) : character),
118
+ child);
122
119
  });
120
+ Element.remove(child);
121
+ }
122
+ });
123
123
  },
124
124
  multiple: function(element, effect) {
125
- var elements;
126
- if (((typeof element == 'object') ||
127
- Object.isFunction(element)) &&
128
- (element.length))
129
- elements = element;
130
- else
131
- elements = $(element).childNodes;
132
-
133
- var options = Object.extend({
134
- speed: 0.1,
135
- delay: 0.0
136
- }, arguments[2] || { });
137
- var masterDelay = options.delay;
138
-
139
- $A(elements).each( function(element, index) {
140
- new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
141
- });
125
+ var elements;
126
+ if (((typeof element == 'object') ||
127
+ Object.isFunction(element)) &&
128
+ (element.length))
129
+ elements = element;
130
+ else
131
+ elements = $(element).childNodes;
132
+
133
+ var options = Object.extend({
134
+ speed: 0.1,
135
+ delay: 0.0
136
+ }, arguments[2] || { });
137
+ var masterDelay = options.delay;
138
+
139
+ $A(elements).each( function(element, index) {
140
+ new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
141
+ });
142
142
  },
143
143
  PAIRS: {
144
- 'slide': ['SlideDown','SlideUp'],
145
- 'blind': ['BlindDown','BlindUp'],
146
- 'appear': ['Appear','Fade']
144
+ 'slide': ['SlideDown','SlideUp'],
145
+ 'blind': ['BlindDown','BlindUp'],
146
+ 'appear': ['Appear','Fade']
147
147
  },
148
148
  toggle: function(element, effect) {
149
- element = $(element);
150
- effect = (effect || 'appear').toLowerCase();
151
- var options = Object.extend({
152
- queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
153
- }, arguments[2] || { });
154
- Effect[element.visible() ?
155
- Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
149
+ element = $(element);
150
+ effect = (effect || 'appear').toLowerCase();
151
+ var options = Object.extend({
152
+ queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
153
+ }, arguments[2] || { });
154
+ Effect[element.visible() ?
155
+ Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
156
156
  }
157
157
  };
158
158
 
@@ -162,65 +162,65 @@ Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
162
162
 
163
163
  Effect.ScopedQueue = Class.create(Enumerable, {
164
164
  initialize: function() {
165
- this.effects = [];
166
- this.interval = null;
165
+ this.effects = [];
166
+ this.interval = null;
167
167
  },
168
168
  _each: function(iterator) {
169
- this.effects._each(iterator);
169
+ this.effects._each(iterator);
170
170
  },
171
171
  add: function(effect) {
172
- var timestamp = new Date().getTime();
173
-
174
- var position = Object.isString(effect.options.queue) ?
175
- effect.options.queue : effect.options.queue.position;
176
-
177
- switch(position) {
178
- case 'front':
179
- // move unstarted effects after this effect
180
- this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
181
- e.startOn += effect.finishOn;
182
- e.finishOn += effect.finishOn;
183
- });
184
- break;
185
- case 'with-last':
186
- timestamp = this.effects.pluck('startOn').max() || timestamp;
187
- break;
188
- case 'end':
189
- // start effect after last queued effect has finished
190
- timestamp = this.effects.pluck('finishOn').max() || timestamp;
191
- break;
192
- }
172
+ var timestamp = new Date().getTime();
173
+
174
+ var position = Object.isString(effect.options.queue) ?
175
+ effect.options.queue : effect.options.queue.position;
176
+
177
+ switch(position) {
178
+ case 'front':
179
+ // move unstarted effects after this effect
180
+ this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
181
+ e.startOn += effect.finishOn;
182
+ e.finishOn += effect.finishOn;
183
+ });
184
+ break;
185
+ case 'with-last':
186
+ timestamp = this.effects.pluck('startOn').max() || timestamp;
187
+ break;
188
+ case 'end':
189
+ // start effect after last queued effect has finished
190
+ timestamp = this.effects.pluck('finishOn').max() || timestamp;
191
+ break;
192
+ }
193
193
 
194
- effect.startOn += timestamp;
195
- effect.finishOn += timestamp;
194
+ effect.startOn += timestamp;
195
+ effect.finishOn += timestamp;
196
196
 
197
- if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
198
- this.effects.push(effect);
197
+ if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
198
+ this.effects.push(effect);
199
199
 
200
- if (!this.interval)
201
- this.interval = setInterval(this.loop.bind(this), 15);
200
+ if (!this.interval)
201
+ this.interval = setInterval(this.loop.bind(this), 15);
202
202
  },
203
203
  remove: function(effect) {
204
- this.effects = this.effects.reject(function(e) { return e==effect });
205
- if (this.effects.length == 0) {
206
- clearInterval(this.interval);
207
- this.interval = null;
208
- }
204
+ this.effects = this.effects.reject(function(e) { return e==effect });
205
+ if (this.effects.length == 0) {
206
+ clearInterval(this.interval);
207
+ this.interval = null;
208
+ }
209
209
  },
210
210
  loop: function() {
211
- var timePos = new Date().getTime();
212
- for(var i=0, len=this.effects.length;i<len;i++)
213
- this.effects[i] && this.effects[i].loop(timePos);
211
+ var timePos = new Date().getTime();
212
+ for(var i=0, len=this.effects.length;i<len;i++)
213
+ this.effects[i] && this.effects[i].loop(timePos);
214
214
  }
215
215
  });
216
216
 
217
217
  Effect.Queues = {
218
218
  instances: $H(),
219
219
  get: function(queueName) {
220
- if (!Object.isString(queueName)) return queueName;
220
+ if (!Object.isString(queueName)) return queueName;
221
221
 
222
- return this.instances.get(queueName) ||
223
- this.instances.set(queueName, new Effect.ScopedQueue());
222
+ return this.instances.get(queueName) ||
223
+ this.instances.set(queueName, new Effect.ScopedQueue());
224
224
  }
225
225
  };
226
226
  Effect.Queue = Effect.Queues.get('global');
@@ -228,287 +228,287 @@ Effect.Queue = Effect.Queues.get('global');
228
228
  Effect.Base = Class.create({
229
229
  position: null,
230
230
  start: function(options) {
231
- function codeForEvent(options,eventName){
232
- return (
233
- (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
234
- (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
235
- );
231
+ function codeForEvent(options,eventName){
232
+ return (
233
+ (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
234
+ (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
235
+ );
236
+ }
237
+ if (options && options.transition === false) options.transition = Effect.Transitions.linear;
238
+ this.options = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
239
+ this.currentFrame = 0;
240
+ this.state = 'idle';
241
+ this.startOn = this.options.delay*1000;
242
+ this.finishOn = this.startOn+(this.options.duration*1000);
243
+ this.fromToDelta = this.options.to-this.options.from;
244
+ this.totalTime = this.finishOn-this.startOn;
245
+ this.totalFrames = this.options.fps*this.options.duration;
246
+
247
+ this.render = (function() {
248
+ function dispatch(effect, eventName) {
249
+ if (effect.options[eventName + 'Internal'])
250
+ effect.options[eventName + 'Internal'](effect);
251
+ if (effect.options[eventName])
252
+ effect.options[eventName](effect);
253
+ }
254
+
255
+ return function(pos) {
256
+ if (this.state === "idle") {
257
+ this.state = "running";
258
+ dispatch(this, 'beforeSetup');
259
+ if (this.setup) this.setup();
260
+ dispatch(this, 'afterSetup');
236
261
  }
237
- if (options && options.transition === false) options.transition = Effect.Transitions.linear;
238
- this.options = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
239
- this.currentFrame = 0;
240
- this.state = 'idle';
241
- this.startOn = this.options.delay*1000;
242
- this.finishOn = this.startOn+(this.options.duration*1000);
243
- this.fromToDelta = this.options.to-this.options.from;
244
- this.totalTime = this.finishOn-this.startOn;
245
- this.totalFrames = this.options.fps*this.options.duration;
246
-
247
- this.render = (function() {
248
- function dispatch(effect, eventName) {
249
- if (effect.options[eventName + 'Internal'])
250
- effect.options[eventName + 'Internal'](effect);
251
- if (effect.options[eventName])
252
- effect.options[eventName](effect);
253
- }
254
-
255
- return function(pos) {
256
- if (this.state === "idle") {
257
- this.state = "running";
258
- dispatch(this, 'beforeSetup');
259
- if (this.setup) this.setup();
260
- dispatch(this, 'afterSetup');
261
- }
262
- if (this.state === "running") {
263
- pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
264
- this.position = pos;
265
- dispatch(this, 'beforeUpdate');
266
- if (this.update) this.update(pos);
267
- dispatch(this, 'afterUpdate');
268
- }
269
- };
270
- })();
271
-
272
- this.event('beforeStart');
273
- if (!this.options.sync)
274
- Effect.Queues.get(Object.isString(this.options.queue) ?
275
- 'global' : this.options.queue.scope).add(this);
262
+ if (this.state === "running") {
263
+ pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
264
+ this.position = pos;
265
+ dispatch(this, 'beforeUpdate');
266
+ if (this.update) this.update(pos);
267
+ dispatch(this, 'afterUpdate');
268
+ }
269
+ };
270
+ })();
271
+
272
+ this.event('beforeStart');
273
+ if (!this.options.sync)
274
+ Effect.Queues.get(Object.isString(this.options.queue) ?
275
+ 'global' : this.options.queue.scope).add(this);
276
276
  },
277
277
  loop: function(timePos) {
278
- if (timePos >= this.startOn) {
279
- if (timePos >= this.finishOn) {
280
- this.render(1.0);
281
- this.cancel();
282
- this.event('beforeFinish');
283
- if (this.finish) this.finish();
284
- this.event('afterFinish');
285
- return;
286
- }
287
- var pos = (timePos - this.startOn) / this.totalTime,
288
- frame = (pos * this.totalFrames).round();
289
- if (frame > this.currentFrame) {
290
- this.render(pos);
291
- this.currentFrame = frame;
292
- }
278
+ if (timePos >= this.startOn) {
279
+ if (timePos >= this.finishOn) {
280
+ this.render(1.0);
281
+ this.cancel();
282
+ this.event('beforeFinish');
283
+ if (this.finish) this.finish();
284
+ this.event('afterFinish');
285
+ return;
293
286
  }
287
+ var pos = (timePos - this.startOn) / this.totalTime,
288
+ frame = (pos * this.totalFrames).round();
289
+ if (frame > this.currentFrame) {
290
+ this.render(pos);
291
+ this.currentFrame = frame;
292
+ }
293
+ }
294
294
  },
295
295
  cancel: function() {
296
- if (!this.options.sync)
297
- Effect.Queues.get(Object.isString(this.options.queue) ?
298
- 'global' : this.options.queue.scope).remove(this);
299
- this.state = 'finished';
296
+ if (!this.options.sync)
297
+ Effect.Queues.get(Object.isString(this.options.queue) ?
298
+ 'global' : this.options.queue.scope).remove(this);
299
+ this.state = 'finished';
300
300
  },
301
301
  event: function(eventName) {
302
- if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
303
- if (this.options[eventName]) this.options[eventName](this);
302
+ if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
303
+ if (this.options[eventName]) this.options[eventName](this);
304
304
  },
305
305
  inspect: function() {
306
- var data = $H();
307
- for(property in this)
308
- if (!Object.isFunction(this[property])) data.set(property, this[property]);
309
- return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
306
+ var data = $H();
307
+ for(property in this)
308
+ if (!Object.isFunction(this[property])) data.set(property, this[property]);
309
+ return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
310
310
  }
311
311
  });
312
312
 
313
313
  Effect.Parallel = Class.create(Effect.Base, {
314
314
  initialize: function(effects) {
315
- this.effects = effects || [];
316
- this.start(arguments[1]);
315
+ this.effects = effects || [];
316
+ this.start(arguments[1]);
317
317
  },
318
318
  update: function(position) {
319
- this.effects.invoke('render', position);
319
+ this.effects.invoke('render', position);
320
320
  },
321
321
  finish: function(position) {
322
- this.effects.each( function(effect) {
323
- effect.render(1.0);
324
- effect.cancel();
325
- effect.event('beforeFinish');
326
- if (effect.finish) effect.finish(position);
327
- effect.event('afterFinish');
328
- });
322
+ this.effects.each( function(effect) {
323
+ effect.render(1.0);
324
+ effect.cancel();
325
+ effect.event('beforeFinish');
326
+ if (effect.finish) effect.finish(position);
327
+ effect.event('afterFinish');
328
+ });
329
329
  }
330
330
  });
331
331
 
332
332
  Effect.Tween = Class.create(Effect.Base, {
333
333
  initialize: function(object, from, to) {
334
- object = Object.isString(object) ? $(object) : object;
335
- var args = $A(arguments), method = args.last(),
336
- options = args.length == 5 ? args[3] : null;
337
- this.method = Object.isFunction(method) ? method.bind(object) :
338
- Object.isFunction(object[method]) ? object[method].bind(object) :
339
- function(value) { object[method] = value };
340
- this.start(Object.extend({ from: from, to: to }, options || { }));
334
+ object = Object.isString(object) ? $(object) : object;
335
+ var args = $A(arguments), method = args.last(),
336
+ options = args.length == 5 ? args[3] : null;
337
+ this.method = Object.isFunction(method) ? method.bind(object) :
338
+ Object.isFunction(object[method]) ? object[method].bind(object) :
339
+ function(value) { object[method] = value };
340
+ this.start(Object.extend({ from: from, to: to }, options || { }));
341
341
  },
342
342
  update: function(position) {
343
- this.method(position);
343
+ this.method(position);
344
344
  }
345
345
  });
346
346
 
347
347
  Effect.Event = Class.create(Effect.Base, {
348
348
  initialize: function() {
349
- this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
349
+ this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
350
350
  },
351
351
  update: Prototype.emptyFunction
352
352
  });
353
353
 
354
354
  Effect.Opacity = Class.create(Effect.Base, {
355
355
  initialize: function(element) {
356
- this.element = $(element);
357
- if (!this.element) throw(Effect._elementDoesNotExistError);
358
- // make this work on IE on elements without 'layout'
359
- if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
360
- this.element.setStyle({zoom: 1});
361
- var options = Object.extend({
362
- from: this.element.getOpacity() || 0.0,
363
- to: 1.0
364
- }, arguments[1] || { });
365
- this.start(options);
356
+ this.element = $(element);
357
+ if (!this.element) throw(Effect._elementDoesNotExistError);
358
+ // make this work on IE on elements without 'layout'
359
+ if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
360
+ this.element.setStyle({zoom: 1});
361
+ var options = Object.extend({
362
+ from: this.element.getOpacity() || 0.0,
363
+ to: 1.0
364
+ }, arguments[1] || { });
365
+ this.start(options);
366
366
  },
367
367
  update: function(position) {
368
- this.element.setOpacity(position);
368
+ this.element.setOpacity(position);
369
369
  }
370
370
  });
371
371
 
372
372
  Effect.Move = Class.create(Effect.Base, {
373
373
  initialize: function(element) {
374
- this.element = $(element);
375
- if (!this.element) throw(Effect._elementDoesNotExistError);
376
- var options = Object.extend({
377
- x: 0,
378
- y: 0,
379
- mode: 'relative'
380
- }, arguments[1] || { });
381
- this.start(options);
374
+ this.element = $(element);
375
+ if (!this.element) throw(Effect._elementDoesNotExistError);
376
+ var options = Object.extend({
377
+ x: 0,
378
+ y: 0,
379
+ mode: 'relative'
380
+ }, arguments[1] || { });
381
+ this.start(options);
382
382
  },
383
383
  setup: function() {
384
- this.element.makePositioned();
385
- this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
386
- this.originalTop = parseFloat(this.element.getStyle('top') || '0');
387
- if (this.options.mode == 'absolute') {
388
- this.options.x = this.options.x - this.originalLeft;
389
- this.options.y = this.options.y - this.originalTop;
390
- }
384
+ this.element.makePositioned();
385
+ this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
386
+ this.originalTop = parseFloat(this.element.getStyle('top') || '0');
387
+ if (this.options.mode == 'absolute') {
388
+ this.options.x = this.options.x - this.originalLeft;
389
+ this.options.y = this.options.y - this.originalTop;
390
+ }
391
391
  },
392
392
  update: function(position) {
393
- this.element.setStyle({
394
- left: (this.options.x * position + this.originalLeft).round() + 'px',
395
- top: (this.options.y * position + this.originalTop).round() + 'px'
396
- });
393
+ this.element.setStyle({
394
+ left: (this.options.x * position + this.originalLeft).round() + 'px',
395
+ top: (this.options.y * position + this.originalTop).round() + 'px'
396
+ });
397
397
  }
398
398
  });
399
399
 
400
400
  // for backwards compatibility
401
401
  Effect.MoveBy = function(element, toTop, toLeft) {
402
402
  return new Effect.Move(element,
403
- Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
403
+ Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
404
404
  };
405
405
 
406
406
  Effect.Scale = Class.create(Effect.Base, {
407
407
  initialize: function(element, percent) {
408
- this.element = $(element);
409
- if (!this.element) throw(Effect._elementDoesNotExistError);
410
- var options = Object.extend({
411
- scaleX: true,
412
- scaleY: true,
413
- scaleContent: true,
414
- scaleFromCenter: false,
415
- scaleMode: 'box', // 'box' or 'contents' or { } with provided values
416
- scaleFrom: 100.0,
417
- scaleTo: percent
418
- }, arguments[2] || { });
419
- this.start(options);
408
+ this.element = $(element);
409
+ if (!this.element) throw(Effect._elementDoesNotExistError);
410
+ var options = Object.extend({
411
+ scaleX: true,
412
+ scaleY: true,
413
+ scaleContent: true,
414
+ scaleFromCenter: false,
415
+ scaleMode: 'box', // 'box' or 'contents' or { } with provided values
416
+ scaleFrom: 100.0,
417
+ scaleTo: percent
418
+ }, arguments[2] || { });
419
+ this.start(options);
420
420
  },
421
421
  setup: function() {
422
- this.restoreAfterFinish = this.options.restoreAfterFinish || false;
423
- this.elementPositioning = this.element.getStyle('position');
424
-
425
- this.originalStyle = { };
426
- ['top','left','width','height','fontSize'].each( function(k) {
427
- this.originalStyle[k] = this.element.style[k];
428
- }.bind(this));
429
-
430
- this.originalTop = this.element.offsetTop;
431
- this.originalLeft = this.element.offsetLeft;
432
-
433
- var fontSize = this.element.getStyle('font-size') || '100%';
434
- ['em','px','%','pt'].each( function(fontSizeType) {
435
- if (fontSize.indexOf(fontSizeType)>0) {
436
- this.fontSize = parseFloat(fontSize);
437
- this.fontSizeType = fontSizeType;
438
- }
439
- }.bind(this));
440
-
441
- this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
442
-
443
- this.dims = null;
444
- if (this.options.scaleMode=='box')
445
- this.dims = [this.element.offsetHeight, this.element.offsetWidth];
446
- if (/^content/.test(this.options.scaleMode))
447
- this.dims = [this.element.scrollHeight, this.element.scrollWidth];
448
- if (!this.dims)
449
- this.dims = [this.options.scaleMode.originalHeight,
450
- this.options.scaleMode.originalWidth];
422
+ this.restoreAfterFinish = this.options.restoreAfterFinish || false;
423
+ this.elementPositioning = this.element.getStyle('position');
424
+
425
+ this.originalStyle = { };
426
+ ['top','left','width','height','fontSize'].each( function(k) {
427
+ this.originalStyle[k] = this.element.style[k];
428
+ }.bind(this));
429
+
430
+ this.originalTop = this.element.offsetTop;
431
+ this.originalLeft = this.element.offsetLeft;
432
+
433
+ var fontSize = this.element.getStyle('font-size') || '100%';
434
+ ['em','px','%','pt'].each( function(fontSizeType) {
435
+ if (fontSize.indexOf(fontSizeType)>0) {
436
+ this.fontSize = parseFloat(fontSize);
437
+ this.fontSizeType = fontSizeType;
438
+ }
439
+ }.bind(this));
440
+
441
+ this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
442
+
443
+ this.dims = null;
444
+ if (this.options.scaleMode=='box')
445
+ this.dims = [this.element.offsetHeight, this.element.offsetWidth];
446
+ if (/^content/.test(this.options.scaleMode))
447
+ this.dims = [this.element.scrollHeight, this.element.scrollWidth];
448
+ if (!this.dims)
449
+ this.dims = [this.options.scaleMode.originalHeight,
450
+ this.options.scaleMode.originalWidth];
451
451
  },
452
452
  update: function(position) {
453
- var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
454
- if (this.options.scaleContent && this.fontSize)
455
- this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
456
- this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
453
+ var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
454
+ if (this.options.scaleContent && this.fontSize)
455
+ this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
456
+ this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
457
457
  },
458
458
  finish: function(position) {
459
- if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
459
+ if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
460
460
  },
461
461
  setDimensions: function(height, width) {
462
- var d = { };
463
- if (this.options.scaleX) d.width = width.round() + 'px';
464
- if (this.options.scaleY) d.height = height.round() + 'px';
465
- if (this.options.scaleFromCenter) {
466
- var topd = (height - this.dims[0])/2;
467
- var leftd = (width - this.dims[1])/2;
468
- if (this.elementPositioning == 'absolute') {
469
- if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
470
- if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
471
- } else {
472
- if (this.options.scaleY) d.top = -topd + 'px';
473
- if (this.options.scaleX) d.left = -leftd + 'px';
474
- }
462
+ var d = { };
463
+ if (this.options.scaleX) d.width = width.round() + 'px';
464
+ if (this.options.scaleY) d.height = height.round() + 'px';
465
+ if (this.options.scaleFromCenter) {
466
+ var topd = (height - this.dims[0])/2;
467
+ var leftd = (width - this.dims[1])/2;
468
+ if (this.elementPositioning == 'absolute') {
469
+ if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
470
+ if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
471
+ } else {
472
+ if (this.options.scaleY) d.top = -topd + 'px';
473
+ if (this.options.scaleX) d.left = -leftd + 'px';
475
474
  }
476
- this.element.setStyle(d);
475
+ }
476
+ this.element.setStyle(d);
477
477
  }
478
478
  });
479
479
 
480
480
  Effect.Highlight = Class.create(Effect.Base, {
481
481
  initialize: function(element) {
482
- this.element = $(element);
483
- if (!this.element) throw(Effect._elementDoesNotExistError);
484
- var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
485
- this.start(options);
482
+ this.element = $(element);
483
+ if (!this.element) throw(Effect._elementDoesNotExistError);
484
+ var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
485
+ this.start(options);
486
486
  },
487
487
  setup: function() {
488
- // Prevent executing on elements not in the layout flow
489
- if (this.element.getStyle('display')=='none') { this.cancel(); return; }
490
- // Disable background image during the effect
491
- this.oldStyle = { };
492
- if (!this.options.keepBackgroundImage) {
493
- this.oldStyle.backgroundImage = this.element.getStyle('background-image');
494
- this.element.setStyle({backgroundImage: 'none'});
495
- }
496
- if (!this.options.endcolor)
497
- this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
498
- if (!this.options.restorecolor)
499
- this.options.restorecolor = this.element.getStyle('background-color');
500
- // init color calculations
501
- this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
502
- this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
488
+ // Prevent executing on elements not in the layout flow
489
+ if (this.element.getStyle('display')=='none') { this.cancel(); return; }
490
+ // Disable background image during the effect
491
+ this.oldStyle = { };
492
+ if (!this.options.keepBackgroundImage) {
493
+ this.oldStyle.backgroundImage = this.element.getStyle('background-image');
494
+ this.element.setStyle({backgroundImage: 'none'});
495
+ }
496
+ if (!this.options.endcolor)
497
+ this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
498
+ if (!this.options.restorecolor)
499
+ this.options.restorecolor = this.element.getStyle('background-color');
500
+ // init color calculations
501
+ this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
502
+ this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
503
503
  },
504
504
  update: function(position) {
505
- this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
506
- return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
505
+ this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
506
+ return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
507
507
  },
508
508
  finish: function() {
509
- this.element.setStyle(Object.extend(this.oldStyle, {
510
- backgroundColor: this.options.restorecolor
511
- }));
509
+ this.element.setStyle(Object.extend(this.oldStyle, {
510
+ backgroundColor: this.options.restorecolor
511
+ }));
512
512
  }
513
513
  });
514
514
 
@@ -520,10 +520,10 @@ Effect.ScrollTo = function(element) {
520
520
  if (options.offset) elementOffsets[1] += options.offset;
521
521
 
522
522
  return new Effect.Tween(null,
523
- scrollOffsets.top,
524
- elementOffsets[1],
525
- options,
526
- function(p){ scrollTo(scrollOffsets.left, p.round()); }
523
+ scrollOffsets.top,
524
+ elementOffsets[1],
525
+ options,
526
+ function(p){ scrollTo(scrollOffsets.left, p.round()); }
527
527
  );
528
528
  };
529
529
 
@@ -533,12 +533,12 @@ Effect.Fade = function(element) {
533
533
  element = $(element);
534
534
  var oldOpacity = element.getInlineOpacity();
535
535
  var options = Object.extend({
536
- from: element.getOpacity() || 1.0,
537
- to: 0.0,
538
- afterFinishInternal: function(effect) {
539
- if (effect.options.to!=0) return;
540
- effect.element.hide().setStyle({opacity: oldOpacity});
541
- }
536
+ from: element.getOpacity() || 1.0,
537
+ to: 0.0,
538
+ afterFinishInternal: function(effect) {
539
+ if (effect.options.to!=0) return;
540
+ effect.element.hide().setStyle({opacity: oldOpacity});
541
+ }
542
542
  }, arguments[1] || { });
543
543
  return new Effect.Opacity(element,options);
544
544
  };
@@ -550,10 +550,10 @@ Effect.Appear = function(element) {
550
550
  to: 1.0,
551
551
  // force Safari to render floated elements properly
552
552
  afterFinishInternal: function(effect) {
553
- effect.element.forceRerendering();
553
+ effect.element.forceRerendering();
554
554
  },
555
555
  beforeSetup: function(effect) {
556
- effect.element.setOpacity(effect.options.from).show();
556
+ effect.element.setOpacity(effect.options.from).show();
557
557
  }}, arguments[1] || { });
558
558
  return new Effect.Opacity(element,options);
559
559
  };
@@ -561,24 +561,24 @@ Effect.Appear = function(element) {
561
561
  Effect.Puff = function(element) {
562
562
  element = $(element);
563
563
  var oldStyle = {
564
- opacity: element.getInlineOpacity(),
565
- position: element.getStyle('position'),
566
- top: element.style.top,
567
- left: element.style.left,
568
- width: element.style.width,
569
- height: element.style.height
564
+ opacity: element.getInlineOpacity(),
565
+ position: element.getStyle('position'),
566
+ top: element.style.top,
567
+ left: element.style.left,
568
+ width: element.style.width,
569
+ height: element.style.height
570
570
  };
571
571
  return new Effect.Parallel(
572
572
  [ new Effect.Scale(element, 200,
573
- { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
574
- new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
575
- Object.extend({ duration: 1.0,
576
- beforeSetupInternal: function(effect) {
577
- Position.absolutize(effect.effects[0].element);
578
- },
579
- afterFinishInternal: function(effect) {
580
- effect.effects[0].element.hide().setStyle(oldStyle); }
581
- }, arguments[1] || { })
573
+ { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
574
+ new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
575
+ Object.extend({ duration: 1.0,
576
+ beforeSetupInternal: function(effect) {
577
+ Position.absolutize(effect.effects[0].element);
578
+ },
579
+ afterFinishInternal: function(effect) {
580
+ effect.effects[0].element.hide().setStyle(oldStyle); }
581
+ }, arguments[1] || { })
582
582
  );
583
583
  };
584
584
 
@@ -586,13 +586,13 @@ Effect.BlindUp = function(element) {
586
586
  element = $(element);
587
587
  element.makeClipping();
588
588
  return new Effect.Scale(element, 0,
589
- Object.extend({ scaleContent: false,
590
- scaleX: false,
591
- restoreAfterFinish: true,
592
- afterFinishInternal: function(effect) {
593
- effect.element.hide().undoClipping();
594
- }
595
- }, arguments[1] || { })
589
+ Object.extend({ scaleContent: false,
590
+ scaleX: false,
591
+ restoreAfterFinish: true,
592
+ afterFinishInternal: function(effect) {
593
+ effect.element.hide().undoClipping();
594
+ }
595
+ }, arguments[1] || { })
596
596
  );
597
597
  };
598
598
 
@@ -600,17 +600,17 @@ Effect.BlindDown = function(element) {
600
600
  element = $(element);
601
601
  var elementDimensions = element.getDimensions();
602
602
  return new Effect.Scale(element, 100, Object.extend({
603
- scaleContent: false,
604
- scaleX: false,
605
- scaleFrom: 0,
606
- scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
607
- restoreAfterFinish: true,
608
- afterSetup: function(effect) {
609
- effect.element.makeClipping().setStyle({height: '0px'}).show();
610
- },
611
- afterFinishInternal: function(effect) {
612
- effect.element.undoClipping();
613
- }
603
+ scaleContent: false,
604
+ scaleX: false,
605
+ scaleFrom: 0,
606
+ scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
607
+ restoreAfterFinish: true,
608
+ afterSetup: function(effect) {
609
+ effect.element.makeClipping().setStyle({height: '0px'}).show();
610
+ },
611
+ afterFinishInternal: function(effect) {
612
+ effect.element.undoClipping();
613
+ }
614
614
  }, arguments[1] || { }));
615
615
  };
616
616
 
@@ -618,68 +618,68 @@ Effect.SwitchOff = function(element) {
618
618
  element = $(element);
619
619
  var oldOpacity = element.getInlineOpacity();
620
620
  return new Effect.Appear(element, Object.extend({
621
- duration: 0.4,
622
- from: 0,
623
- transition: Effect.Transitions.flicker,
621
+ duration: 0.4,
622
+ from: 0,
623
+ transition: Effect.Transitions.flicker,
624
+ afterFinishInternal: function(effect) {
625
+ new Effect.Scale(effect.element, 1, {
626
+ duration: 0.3, scaleFromCenter: true,
627
+ scaleX: false, scaleContent: false, restoreAfterFinish: true,
628
+ beforeSetup: function(effect) {
629
+ effect.element.makePositioned().makeClipping();
630
+ },
624
631
  afterFinishInternal: function(effect) {
625
- new Effect.Scale(effect.element, 1, {
626
- duration: 0.3, scaleFromCenter: true,
627
- scaleX: false, scaleContent: false, restoreAfterFinish: true,
628
- beforeSetup: function(effect) {
629
- effect.element.makePositioned().makeClipping();
630
- },
631
- afterFinishInternal: function(effect) {
632
- effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
633
- }
634
- });
632
+ effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
635
633
  }
634
+ });
635
+ }
636
636
  }, arguments[1] || { }));
637
637
  };
638
638
 
639
639
  Effect.DropOut = function(element) {
640
640
  element = $(element);
641
641
  var oldStyle = {
642
- top: element.getStyle('top'),
643
- left: element.getStyle('left'),
644
- opacity: element.getInlineOpacity() };
642
+ top: element.getStyle('top'),
643
+ left: element.getStyle('left'),
644
+ opacity: element.getInlineOpacity() };
645
645
  return new Effect.Parallel(
646
- [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
647
- new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
648
- Object.extend(
649
- { duration: 0.5,
650
- beforeSetup: function(effect) {
651
- effect.effects[0].element.makePositioned();
652
- },
653
- afterFinishInternal: function(effect) {
654
- effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
655
- }
656
- }, arguments[1] || { }));
646
+ [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
647
+ new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
648
+ Object.extend(
649
+ { duration: 0.5,
650
+ beforeSetup: function(effect) {
651
+ effect.effects[0].element.makePositioned();
652
+ },
653
+ afterFinishInternal: function(effect) {
654
+ effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
655
+ }
656
+ }, arguments[1] || { }));
657
657
  };
658
658
 
659
659
  Effect.Shake = function(element) {
660
660
  element = $(element);
661
661
  var options = Object.extend({
662
- distance: 20,
663
- duration: 0.5
662
+ distance: 20,
663
+ duration: 0.5
664
664
  }, arguments[1] || {});
665
665
  var distance = parseFloat(options.distance);
666
666
  var split = parseFloat(options.duration) / 10.0;
667
667
  var oldStyle = {
668
- top: element.getStyle('top'),
669
- left: element.getStyle('left') };
670
- return new Effect.Move(element,
671
- { x: distance, y: 0, duration: split, afterFinishInternal: function(effect) {
672
- new Effect.Move(effect.element,
673
- { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
674
- new Effect.Move(effect.element,
675
- { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
676
- new Effect.Move(effect.element,
677
- { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
678
- new Effect.Move(effect.element,
679
- { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
680
- new Effect.Move(effect.element,
681
- { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
682
- effect.element.undoPositioned().setStyle(oldStyle);
668
+ top: element.getStyle('top'),
669
+ left: element.getStyle('left') };
670
+ return new Effect.Move(element,
671
+ { x: distance, y: 0, duration: split, afterFinishInternal: function(effect) {
672
+ new Effect.Move(effect.element,
673
+ { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
674
+ new Effect.Move(effect.element,
675
+ { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
676
+ new Effect.Move(effect.element,
677
+ { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
678
+ new Effect.Move(effect.element,
679
+ { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
680
+ new Effect.Move(effect.element,
681
+ { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
682
+ effect.element.undoPositioned().setStyle(oldStyle);
683
683
  }}); }}); }}); }}); }}); }});
684
684
  };
685
685
 
@@ -689,25 +689,25 @@ Effect.SlideDown = function(element) {
689
689
  var oldInnerBottom = element.down().getStyle('bottom');
690
690
  var elementDimensions = element.getDimensions();
691
691
  return new Effect.Scale(element, 100, Object.extend({
692
- scaleContent: false,
693
- scaleX: false,
694
- scaleFrom: window.opera ? 0 : 1,
695
- scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
696
- restoreAfterFinish: true,
697
- afterSetup: function(effect) {
698
- effect.element.makePositioned();
699
- effect.element.down().makePositioned();
700
- if (window.opera) effect.element.setStyle({top: ''});
701
- effect.element.makeClipping().setStyle({height: '0px'}).show();
702
- },
703
- afterUpdateInternal: function(effect) {
704
- effect.element.down().setStyle({bottom:
705
- (effect.dims[0] - effect.element.clientHeight) + 'px' });
706
- },
707
- afterFinishInternal: function(effect) {
708
- effect.element.undoClipping().undoPositioned();
709
- effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
710
- }, arguments[1] || { })
692
+ scaleContent: false,
693
+ scaleX: false,
694
+ scaleFrom: window.opera ? 0 : 1,
695
+ scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
696
+ restoreAfterFinish: true,
697
+ afterSetup: function(effect) {
698
+ effect.element.makePositioned();
699
+ effect.element.down().makePositioned();
700
+ if (window.opera) effect.element.setStyle({top: ''});
701
+ effect.element.makeClipping().setStyle({height: '0px'}).show();
702
+ },
703
+ afterUpdateInternal: function(effect) {
704
+ effect.element.down().setStyle({bottom:
705
+ (effect.dims[0] - effect.element.clientHeight) + 'px' });
706
+ },
707
+ afterFinishInternal: function(effect) {
708
+ effect.element.undoClipping().undoPositioned();
709
+ effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
710
+ }, arguments[1] || { })
711
711
  );
712
712
  };
713
713
 
@@ -717,25 +717,25 @@ Effect.SlideUp = function(element) {
717
717
  var elementDimensions = element.getDimensions();
718
718
  return new Effect.Scale(element, window.opera ? 0 : 1,
719
719
  Object.extend({ scaleContent: false,
720
- scaleX: false,
721
- scaleMode: 'box',
722
- scaleFrom: 100,
723
- scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
724
- restoreAfterFinish: true,
725
- afterSetup: function(effect) {
726
- effect.element.makePositioned();
727
- effect.element.down().makePositioned();
728
- if (window.opera) effect.element.setStyle({top: ''});
729
- effect.element.makeClipping().show();
730
- },
731
- afterUpdateInternal: function(effect) {
732
- effect.element.down().setStyle({bottom:
733
- (effect.dims[0] - effect.element.clientHeight) + 'px' });
734
- },
735
- afterFinishInternal: function(effect) {
736
- effect.element.hide().undoClipping().undoPositioned();
737
- effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
738
- }
720
+ scaleX: false,
721
+ scaleMode: 'box',
722
+ scaleFrom: 100,
723
+ scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
724
+ restoreAfterFinish: true,
725
+ afterSetup: function(effect) {
726
+ effect.element.makePositioned();
727
+ effect.element.down().makePositioned();
728
+ if (window.opera) effect.element.setStyle({top: ''});
729
+ effect.element.makeClipping().show();
730
+ },
731
+ afterUpdateInternal: function(effect) {
732
+ effect.element.down().setStyle({bottom:
733
+ (effect.dims[0] - effect.element.clientHeight) + 'px' });
734
+ },
735
+ afterFinishInternal: function(effect) {
736
+ effect.element.hide().undoClipping().undoPositioned();
737
+ effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
738
+ }
739
739
  }, arguments[1] || { })
740
740
  );
741
741
  };
@@ -743,297 +743,297 @@ Effect.SlideUp = function(element) {
743
743
  // Bug in opera makes the TD containing this element expand for a instance after finish
744
744
  Effect.Squish = function(element) {
745
745
  return new Effect.Scale(element, window.opera ? 1 : 0, {
746
- restoreAfterFinish: true,
747
- beforeSetup: function(effect) {
748
- effect.element.makeClipping();
749
- },
750
- afterFinishInternal: function(effect) {
751
- effect.element.hide().undoClipping();
752
- }
746
+ restoreAfterFinish: true,
747
+ beforeSetup: function(effect) {
748
+ effect.element.makeClipping();
749
+ },
750
+ afterFinishInternal: function(effect) {
751
+ effect.element.hide().undoClipping();
752
+ }
753
753
  });
754
754
  };
755
755
 
756
756
  Effect.Grow = function(element) {
757
757
  element = $(element);
758
758
  var options = Object.extend({
759
- direction: 'center',
760
- moveTransition: Effect.Transitions.sinoidal,
761
- scaleTransition: Effect.Transitions.sinoidal,
762
- opacityTransition: Effect.Transitions.full
759
+ direction: 'center',
760
+ moveTransition: Effect.Transitions.sinoidal,
761
+ scaleTransition: Effect.Transitions.sinoidal,
762
+ opacityTransition: Effect.Transitions.full
763
763
  }, arguments[1] || { });
764
764
  var oldStyle = {
765
- top: element.style.top,
766
- left: element.style.left,
767
- height: element.style.height,
768
- width: element.style.width,
769
- opacity: element.getInlineOpacity() };
765
+ top: element.style.top,
766
+ left: element.style.left,
767
+ height: element.style.height,
768
+ width: element.style.width,
769
+ opacity: element.getInlineOpacity() };
770
770
 
771
771
  var dims = element.getDimensions();
772
772
  var initialMoveX, initialMoveY;
773
773
  var moveX, moveY;
774
774
 
775
775
  switch (options.direction) {
776
- case 'top-left':
777
- initialMoveX = initialMoveY = moveX = moveY = 0;
778
- break;
779
- case 'top-right':
780
- initialMoveX = dims.width;
781
- initialMoveY = moveY = 0;
782
- moveX = -dims.width;
783
- break;
784
- case 'bottom-left':
785
- initialMoveX = moveX = 0;
786
- initialMoveY = dims.height;
787
- moveY = -dims.height;
788
- break;
789
- case 'bottom-right':
790
- initialMoveX = dims.width;
791
- initialMoveY = dims.height;
792
- moveX = -dims.width;
793
- moveY = -dims.height;
794
- break;
795
- case 'center':
796
- initialMoveX = dims.width / 2;
797
- initialMoveY = dims.height / 2;
798
- moveX = -dims.width / 2;
799
- moveY = -dims.height / 2;
800
- break;
776
+ case 'top-left':
777
+ initialMoveX = initialMoveY = moveX = moveY = 0;
778
+ break;
779
+ case 'top-right':
780
+ initialMoveX = dims.width;
781
+ initialMoveY = moveY = 0;
782
+ moveX = -dims.width;
783
+ break;
784
+ case 'bottom-left':
785
+ initialMoveX = moveX = 0;
786
+ initialMoveY = dims.height;
787
+ moveY = -dims.height;
788
+ break;
789
+ case 'bottom-right':
790
+ initialMoveX = dims.width;
791
+ initialMoveY = dims.height;
792
+ moveX = -dims.width;
793
+ moveY = -dims.height;
794
+ break;
795
+ case 'center':
796
+ initialMoveX = dims.width / 2;
797
+ initialMoveY = dims.height / 2;
798
+ moveX = -dims.width / 2;
799
+ moveY = -dims.height / 2;
800
+ break;
801
801
  }
802
802
 
803
803
  return new Effect.Move(element, {
804
- x: initialMoveX,
805
- y: initialMoveY,
806
- duration: 0.01,
807
- beforeSetup: function(effect) {
808
- effect.element.hide().makeClipping().makePositioned();
809
- },
810
- afterFinishInternal: function(effect) {
811
- new Effect.Parallel(
812
- [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
813
- new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
814
- new Effect.Scale(effect.element, 100, {
815
- scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
816
- sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
817
- ], Object.extend({
818
- beforeSetup: function(effect) {
819
- effect.effects[0].element.setStyle({height: '0px'}).show();
820
- },
821
- afterFinishInternal: function(effect) {
822
- effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
823
- }
824
- }, options)
825
- );
826
- }
804
+ x: initialMoveX,
805
+ y: initialMoveY,
806
+ duration: 0.01,
807
+ beforeSetup: function(effect) {
808
+ effect.element.hide().makeClipping().makePositioned();
809
+ },
810
+ afterFinishInternal: function(effect) {
811
+ new Effect.Parallel(
812
+ [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
813
+ new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
814
+ new Effect.Scale(effect.element, 100, {
815
+ scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
816
+ sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
817
+ ], Object.extend({
818
+ beforeSetup: function(effect) {
819
+ effect.effects[0].element.setStyle({height: '0px'}).show();
820
+ },
821
+ afterFinishInternal: function(effect) {
822
+ effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
823
+ }
824
+ }, options)
825
+ );
826
+ }
827
827
  });
828
828
  };
829
829
 
830
830
  Effect.Shrink = function(element) {
831
831
  element = $(element);
832
832
  var options = Object.extend({
833
- direction: 'center',
834
- moveTransition: Effect.Transitions.sinoidal,
835
- scaleTransition: Effect.Transitions.sinoidal,
836
- opacityTransition: Effect.Transitions.none
833
+ direction: 'center',
834
+ moveTransition: Effect.Transitions.sinoidal,
835
+ scaleTransition: Effect.Transitions.sinoidal,
836
+ opacityTransition: Effect.Transitions.none
837
837
  }, arguments[1] || { });
838
838
  var oldStyle = {
839
- top: element.style.top,
840
- left: element.style.left,
841
- height: element.style.height,
842
- width: element.style.width,
843
- opacity: element.getInlineOpacity() };
839
+ top: element.style.top,
840
+ left: element.style.left,
841
+ height: element.style.height,
842
+ width: element.style.width,
843
+ opacity: element.getInlineOpacity() };
844
844
 
845
845
  var dims = element.getDimensions();
846
846
  var moveX, moveY;
847
847
 
848
848
  switch (options.direction) {
849
- case 'top-left':
850
- moveX = moveY = 0;
851
- break;
852
- case 'top-right':
853
- moveX = dims.width;
854
- moveY = 0;
855
- break;
856
- case 'bottom-left':
857
- moveX = 0;
858
- moveY = dims.height;
859
- break;
860
- case 'bottom-right':
861
- moveX = dims.width;
862
- moveY = dims.height;
863
- break;
864
- case 'center':
865
- moveX = dims.width / 2;
866
- moveY = dims.height / 2;
867
- break;
849
+ case 'top-left':
850
+ moveX = moveY = 0;
851
+ break;
852
+ case 'top-right':
853
+ moveX = dims.width;
854
+ moveY = 0;
855
+ break;
856
+ case 'bottom-left':
857
+ moveX = 0;
858
+ moveY = dims.height;
859
+ break;
860
+ case 'bottom-right':
861
+ moveX = dims.width;
862
+ moveY = dims.height;
863
+ break;
864
+ case 'center':
865
+ moveX = dims.width / 2;
866
+ moveY = dims.height / 2;
867
+ break;
868
868
  }
869
869
 
870
870
  return new Effect.Parallel(
871
- [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
872
- new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
873
- new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
874
- ], Object.extend({
875
- beforeStartInternal: function(effect) {
876
- effect.effects[0].element.makePositioned().makeClipping();
877
- },
878
- afterFinishInternal: function(effect) {
879
- effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
880
- }, options)
871
+ [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
872
+ new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
873
+ new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
874
+ ], Object.extend({
875
+ beforeStartInternal: function(effect) {
876
+ effect.effects[0].element.makePositioned().makeClipping();
877
+ },
878
+ afterFinishInternal: function(effect) {
879
+ effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
880
+ }, options)
881
881
  );
882
882
  };
883
883
 
884
884
  Effect.Pulsate = function(element) {
885
885
  element = $(element);
886
- var options = arguments[1] || { },
887
- oldOpacity = element.getInlineOpacity(),
888
- transition = options.transition || Effect.Transitions.linear,
889
- reverser = function(pos){
890
- return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
891
- };
886
+ var options = arguments[1] || { },
887
+ oldOpacity = element.getInlineOpacity(),
888
+ transition = options.transition || Effect.Transitions.linear,
889
+ reverser = function(pos){
890
+ return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
891
+ };
892
892
 
893
893
  return new Effect.Opacity(element,
894
- Object.extend(Object.extend({ duration: 2.0, from: 0,
895
- afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
896
- }, options), {transition: reverser}));
894
+ Object.extend(Object.extend({ duration: 2.0, from: 0,
895
+ afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
896
+ }, options), {transition: reverser}));
897
897
  };
898
898
 
899
899
  Effect.Fold = function(element) {
900
900
  element = $(element);
901
901
  var oldStyle = {
902
- top: element.style.top,
903
- left: element.style.left,
904
- width: element.style.width,
905
- height: element.style.height };
902
+ top: element.style.top,
903
+ left: element.style.left,
904
+ width: element.style.width,
905
+ height: element.style.height };
906
906
  element.makeClipping();
907
907
  return new Effect.Scale(element, 5, Object.extend({
908
+ scaleContent: false,
909
+ scaleX: false,
910
+ afterFinishInternal: function(effect) {
911
+ new Effect.Scale(element, 1, {
908
912
  scaleContent: false,
909
- scaleX: false,
913
+ scaleY: false,
910
914
  afterFinishInternal: function(effect) {
911
- new Effect.Scale(element, 1, {
912
- scaleContent: false,
913
- scaleY: false,
914
- afterFinishInternal: function(effect) {
915
- effect.element.hide().undoClipping().setStyle(oldStyle);
916
- } });
915
+ effect.element.hide().undoClipping().setStyle(oldStyle);
916
+ } });
917
917
  }}, arguments[1] || { }));
918
918
  };
919
919
 
920
920
  Effect.Morph = Class.create(Effect.Base, {
921
921
  initialize: function(element) {
922
- this.element = $(element);
923
- if (!this.element) throw(Effect._elementDoesNotExistError);
924
- var options = Object.extend({
925
- style: { }
926
- }, arguments[1] || { });
922
+ this.element = $(element);
923
+ if (!this.element) throw(Effect._elementDoesNotExistError);
924
+ var options = Object.extend({
925
+ style: { }
926
+ }, arguments[1] || { });
927
927
 
928
- if (!Object.isString(options.style)) this.style = $H(options.style);
928
+ if (!Object.isString(options.style)) this.style = $H(options.style);
929
+ else {
930
+ if (options.style.include(':'))
931
+ this.style = options.style.parseStyle();
929
932
  else {
930
- if (options.style.include(':'))
931
- this.style = options.style.parseStyle();
932
- else {
933
- this.element.addClassName(options.style);
934
- this.style = $H(this.element.getStyles());
935
- this.element.removeClassName(options.style);
936
- var css = this.element.getStyles();
937
- this.style = this.style.reject(function(style) {
938
- return style.value == css[style.key];
939
- });
940
- options.afterFinishInternal = function(effect) {
941
- effect.element.addClassName(effect.options.style);
942
- effect.transforms.each(function(transform) {
943
- effect.element.style[transform.style] = '';
944
- });
945
- };
946
- }
933
+ this.element.addClassName(options.style);
934
+ this.style = $H(this.element.getStyles());
935
+ this.element.removeClassName(options.style);
936
+ var css = this.element.getStyles();
937
+ this.style = this.style.reject(function(style) {
938
+ return style.value == css[style.key];
939
+ });
940
+ options.afterFinishInternal = function(effect) {
941
+ effect.element.addClassName(effect.options.style);
942
+ effect.transforms.each(function(transform) {
943
+ effect.element.style[transform.style] = '';
944
+ });
945
+ };
947
946
  }
948
- this.start(options);
947
+ }
948
+ this.start(options);
949
949
  },
950
950
 
951
951
  setup: function(){
952
- function parseColor(color){
953
- if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
954
- color = color.parseColor();
955
- return $R(0,2).map(function(i){
956
- return parseInt( color.slice(i*2+1,i*2+3), 16 );
957
- });
958
- }
959
- this.transforms = this.style.map(function(pair){
960
- var property = pair[0], value = pair[1], unit = null;
961
-
962
- if (value.parseColor('#zzzzzz') != '#zzzzzz') {
963
- value = value.parseColor();
964
- unit = 'color';
965
- } else if (property == 'opacity') {
966
- value = parseFloat(value);
967
- if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
968
- this.element.setStyle({zoom: 1});
969
- } else if (Element.CSS_LENGTH.test(value)) {
970
- var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
971
- value = parseFloat(components[1]);
972
- unit = (components.length == 3) ? components[2] : null;
973
- }
974
-
975
- var originalValue = this.element.getStyle(property);
976
- return {
977
- style: property.camelize(),
978
- originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
979
- targetValue: unit=='color' ? parseColor(value) : value,
980
- unit: unit
981
- };
982
- }.bind(this)).reject(function(transform){
983
- return (
984
- (transform.originalValue == transform.targetValue) ||
985
- (
986
- transform.unit != 'color' &&
987
- (isNaN(transform.originalValue) || isNaN(transform.targetValue))
988
- )
989
- );
952
+ function parseColor(color){
953
+ if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
954
+ color = color.parseColor();
955
+ return $R(0,2).map(function(i){
956
+ return parseInt( color.slice(i*2+1,i*2+3), 16 );
990
957
  });
958
+ }
959
+ this.transforms = this.style.map(function(pair){
960
+ var property = pair[0], value = pair[1], unit = null;
961
+
962
+ if (value.parseColor('#zzzzzz') != '#zzzzzz') {
963
+ value = value.parseColor();
964
+ unit = 'color';
965
+ } else if (property == 'opacity') {
966
+ value = parseFloat(value);
967
+ if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
968
+ this.element.setStyle({zoom: 1});
969
+ } else if (Element.CSS_LENGTH.test(value)) {
970
+ var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
971
+ value = parseFloat(components[1]);
972
+ unit = (components.length == 3) ? components[2] : null;
973
+ }
974
+
975
+ var originalValue = this.element.getStyle(property);
976
+ return {
977
+ style: property.camelize(),
978
+ originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
979
+ targetValue: unit=='color' ? parseColor(value) : value,
980
+ unit: unit
981
+ };
982
+ }.bind(this)).reject(function(transform){
983
+ return (
984
+ (transform.originalValue == transform.targetValue) ||
985
+ (
986
+ transform.unit != 'color' &&
987
+ (isNaN(transform.originalValue) || isNaN(transform.targetValue))
988
+ )
989
+ );
990
+ });
991
991
  },
992
992
  update: function(position) {
993
- var style = { }, transform, i = this.transforms.length;
994
- while(i--)
995
- style[(transform = this.transforms[i]).style] =
996
- transform.unit=='color' ? '#'+
997
- (Math.round(transform.originalValue[0]+
998
- (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
999
- (Math.round(transform.originalValue[1]+
1000
- (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
1001
- (Math.round(transform.originalValue[2]+
1002
- (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
1003
- (transform.originalValue +
1004
- (transform.targetValue - transform.originalValue) * position).toFixed(3) +
1005
- (transform.unit === null ? '' : transform.unit);
1006
- this.element.setStyle(style, true);
993
+ var style = { }, transform, i = this.transforms.length;
994
+ while(i--)
995
+ style[(transform = this.transforms[i]).style] =
996
+ transform.unit=='color' ? '#'+
997
+ (Math.round(transform.originalValue[0]+
998
+ (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
999
+ (Math.round(transform.originalValue[1]+
1000
+ (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
1001
+ (Math.round(transform.originalValue[2]+
1002
+ (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
1003
+ (transform.originalValue +
1004
+ (transform.targetValue - transform.originalValue) * position).toFixed(3) +
1005
+ (transform.unit === null ? '' : transform.unit);
1006
+ this.element.setStyle(style, true);
1007
1007
  }
1008
1008
  });
1009
1009
 
1010
1010
  Effect.Transform = Class.create({
1011
1011
  initialize: function(tracks){
1012
- this.tracks = [];
1013
- this.options = arguments[1] || { };
1014
- this.addTracks(tracks);
1012
+ this.tracks = [];
1013
+ this.options = arguments[1] || { };
1014
+ this.addTracks(tracks);
1015
1015
  },
1016
1016
  addTracks: function(tracks){
1017
- tracks.each(function(track){
1018
- track = $H(track);
1019
- var data = track.values().first();
1020
- this.tracks.push($H({
1021
- ids: track.keys().first(),
1022
- effect: Effect.Morph,
1023
- options: { style: data }
1024
- }));
1025
- }.bind(this));
1026
- return this;
1017
+ tracks.each(function(track){
1018
+ track = $H(track);
1019
+ var data = track.values().first();
1020
+ this.tracks.push($H({
1021
+ ids: track.keys().first(),
1022
+ effect: Effect.Morph,
1023
+ options: { style: data }
1024
+ }));
1025
+ }.bind(this));
1026
+ return this;
1027
1027
  },
1028
1028
  play: function(){
1029
- return new Effect.Parallel(
1030
- this.tracks.map(function(track){
1031
- var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
1032
- var elements = [$(ids) || $$(ids)].flatten();
1033
- return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
1034
- }).flatten(),
1035
- this.options
1036
- );
1029
+ return new Effect.Parallel(
1030
+ this.tracks.map(function(track){
1031
+ var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
1032
+ var elements = [$(ids) || $$(ids)].flatten();
1033
+ return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
1034
+ }).flatten(),
1035
+ this.options
1036
+ );
1037
1037
  }
1038
1038
  });
1039
1039
 
@@ -1054,70 +1054,70 @@ String.__parseStyleElement = document.createElement('div');
1054
1054
  String.prototype.parseStyle = function(){
1055
1055
  var style, styleRules = $H();
1056
1056
  if (Prototype.Browser.WebKit)
1057
- style = new Element('div',{style:this}).style;
1057
+ style = new Element('div',{style:this}).style;
1058
1058
  else {
1059
- String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
1060
- style = String.__parseStyleElement.childNodes[0].style;
1059
+ String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
1060
+ style = String.__parseStyleElement.childNodes[0].style;
1061
1061
  }
1062
1062
 
1063
1063
  Element.CSS_PROPERTIES.each(function(property){
1064
- if (style[property]) styleRules.set(property, style[property]);
1064
+ if (style[property]) styleRules.set(property, style[property]);
1065
1065
  });
1066
1066
 
1067
1067
  if (Prototype.Browser.IE && this.include('opacity'))
1068
- styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
1068
+ styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
1069
1069
 
1070
1070
  return styleRules;
1071
1071
  };
1072
1072
 
1073
1073
  if (document.defaultView && document.defaultView.getComputedStyle) {
1074
1074
  Element.getStyles = function(element) {
1075
- var css = document.defaultView.getComputedStyle($(element), null);
1076
- return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
1077
- styles[property] = css[property];
1078
- return styles;
1079
- });
1075
+ var css = document.defaultView.getComputedStyle($(element), null);
1076
+ return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
1077
+ styles[property] = css[property];
1078
+ return styles;
1079
+ });
1080
1080
  };
1081
1081
  } else {
1082
1082
  Element.getStyles = function(element) {
1083
- element = $(element);
1084
- var css = element.currentStyle, styles;
1085
- styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
1086
- results[property] = css[property];
1087
- return results;
1088
- });
1089
- if (!styles.opacity) styles.opacity = element.getOpacity();
1090
- return styles;
1083
+ element = $(element);
1084
+ var css = element.currentStyle, styles;
1085
+ styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
1086
+ results[property] = css[property];
1087
+ return results;
1088
+ });
1089
+ if (!styles.opacity) styles.opacity = element.getOpacity();
1090
+ return styles;
1091
1091
  };
1092
1092
  }
1093
1093
 
1094
1094
  Effect.Methods = {
1095
1095
  morph: function(element, style) {
1096
- element = $(element);
1097
- new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
1098
- return element;
1096
+ element = $(element);
1097
+ new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
1098
+ return element;
1099
1099
  },
1100
1100
  visualEffect: function(element, effect, options) {
1101
- element = $(element);
1102
- var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
1103
- new Effect[klass](element, options);
1104
- return element;
1101
+ element = $(element);
1102
+ var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
1103
+ new Effect[klass](element, options);
1104
+ return element;
1105
1105
  },
1106
1106
  highlight: function(element, options) {
1107
- element = $(element);
1108
- new Effect.Highlight(element, options);
1109
- return element;
1107
+ element = $(element);
1108
+ new Effect.Highlight(element, options);
1109
+ return element;
1110
1110
  }
1111
1111
  };
1112
1112
 
1113
1113
  $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
1114
1114
  'pulsate shake puff squish switchOff dropOut').each(
1115
1115
  function(effect) {
1116
- Effect.Methods[effect] = function(element, options){
1117
- element = $(element);
1118
- Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
1119
- return element;
1120
- };
1116
+ Effect.Methods[effect] = function(element, options){
1117
+ element = $(element);
1118
+ Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
1119
+ return element;
1120
+ };
1121
1121
  }
1122
1122
  );
1123
1123