typo 5.0.2 → 5.0.3.98

Sign up to get free protection for your applications and to get access to all the features.
Files changed (1342) hide show
  1. data/CHANGES-5.0.4 +33 -0
  2. data/MAINTAINERS +4 -8
  3. data/README +10 -8
  4. data/{README.SIDEBARS → SIDEBARS} +0 -0
  5. data/app/apis/blogger_service.rb +2 -3
  6. data/app/apis/meta_weblog_service.rb +6 -7
  7. data/app/apis/movable_type_service.rb +6 -6
  8. data/app/controllers/accounts_controller.rb +9 -9
  9. data/app/controllers/admin/base_controller.rb +3 -22
  10. data/app/controllers/admin/blacklist_controller.rb +4 -4
  11. data/app/controllers/admin/cache_controller.rb +0 -9
  12. data/app/controllers/admin/categories_controller.rb +4 -8
  13. data/app/controllers/admin/comments_controller.rb +4 -4
  14. data/app/controllers/admin/content_controller.rb +44 -44
  15. data/app/controllers/admin/dashboard_controller.rb +8 -0
  16. data/app/controllers/admin/feedback_controller.rb +1 -2
  17. data/app/controllers/admin/pages_controller.rb +49 -24
  18. data/app/controllers/admin/resources_controller.rb +5 -5
  19. data/app/controllers/admin/settings_controller.rb +7 -0
  20. data/app/controllers/admin/sidebar_controller.rb +5 -8
  21. data/app/controllers/admin/tags_controller.rb +43 -0
  22. data/app/controllers/admin/themes_controller.rb +1 -0
  23. data/app/controllers/admin/trackbacks_controller.rb +4 -13
  24. data/app/controllers/admin/users_controller.rb +7 -13
  25. data/app/controllers/application.rb +2 -24
  26. data/app/controllers/articles_controller.rb +28 -23
  27. data/app/controllers/comments_controller.rb +4 -6
  28. data/app/controllers/content_controller.rb +1 -4
  29. data/app/controllers/feedback_controller.rb +12 -2
  30. data/app/controllers/grouping_controller.rb +7 -1
  31. data/app/controllers/redirect_controller.rb +6 -0
  32. data/app/controllers/theme_controller.rb +2 -3
  33. data/app/controllers/trackbacks_controller.rb +4 -6
  34. data/app/controllers/xml_controller.rb +1 -1
  35. data/app/helpers/admin/base_helper.rb +58 -9
  36. data/app/helpers/admin/content_helper.rb +7 -0
  37. data/app/helpers/admin/pages_helper.rb +21 -0
  38. data/app/helpers/admin/settings_helper.rb +1 -1
  39. data/app/helpers/application_helper.rb +11 -9
  40. data/app/helpers/content_helper.rb +5 -14
  41. data/app/helpers/sidebar_helper.rb +1 -1
  42. data/app/models/article.rb +81 -68
  43. data/app/models/blog.rb +14 -44
  44. data/app/models/blog_sweeper.rb +30 -10
  45. data/app/models/category.rb +1 -1
  46. data/app/models/comment.rb +0 -7
  47. data/app/models/content.rb +40 -18
  48. data/app/models/feedback.rb +8 -0
  49. data/app/models/notification_mailer.rb +8 -1
  50. data/app/models/page.rb +5 -0
  51. data/app/models/page_cache.rb +22 -7
  52. data/app/models/profile.rb +10 -0
  53. data/app/models/right.rb +4 -0
  54. data/app/models/sidebar.rb +10 -3
  55. data/app/models/tag.rb +20 -8
  56. data/app/models/trackback.rb +1 -1
  57. data/app/models/url_policy.rb +179 -0
  58. data/app/models/user.rb +30 -0
  59. data/app/views/accounts/login.html.erb +1 -1
  60. data/app/views/accounts/logout.html.erb +1 -1
  61. data/app/views/accounts/signup.html.erb +1 -1
  62. data/app/views/admin/blacklist/_blacklist_patterns.html.erb +2 -2
  63. data/app/views/admin/blacklist/_form.html.erb +13 -14
  64. data/app/views/admin/blacklist/_quick_post.html.erb +4 -13
  65. data/app/views/admin/blacklist/edit.html.erb +8 -11
  66. data/app/views/admin/blacklist/index.html.erb +10 -0
  67. data/app/views/admin/categories/_categories.html.erb +8 -8
  68. data/app/views/admin/categories/_form.html.erb +8 -3
  69. data/app/views/admin/categories/_quick_post.html.erb +1 -1
  70. data/app/views/admin/categories/edit.html.erb +3 -7
  71. data/app/views/admin/categories/index.html.erb +15 -0
  72. data/app/views/admin/comments/_form.html.erb +19 -18
  73. data/app/views/admin/comments/edit.html.erb +3 -7
  74. data/app/views/admin/comments/index.html.erb +30 -0
  75. data/app/views/admin/comments/show.html.erb +24 -8
  76. data/app/views/admin/content/_articles.html.erb +31 -10
  77. data/app/views/admin/content/_attachment.html.erb +18 -2
  78. data/app/views/admin/content/_form.html.erb +76 -86
  79. data/app/views/admin/content/_pages.html.erb +3 -3
  80. data/app/views/admin/content/edit.html.erb +2 -9
  81. data/app/views/admin/content/index.html.erb +17 -0
  82. data/app/views/admin/content/new.html.erb +1 -4
  83. data/app/views/admin/content/show.html.erb +2 -23
  84. data/app/views/admin/dashboard/_comments.html.erb +17 -0
  85. data/app/views/admin/dashboard/_overview.html.erb +4 -0
  86. data/app/views/admin/dashboard/_popular.html.erb +12 -0
  87. data/app/views/admin/dashboard/_posts.html.erb +15 -0
  88. data/app/views/admin/dashboard/_sysinfo.html.erb +13 -0
  89. data/app/views/admin/dashboard/_welcome.html.erb +3 -0
  90. data/app/views/admin/dashboard/index.html.erb +13 -57
  91. data/app/views/admin/feedback/index.html.erb +41 -0
  92. data/app/views/admin/pages/_form.html.erb +31 -35
  93. data/app/views/admin/pages/_pages.html.erb +48 -23
  94. data/app/views/admin/pages/edit.html.erb +3 -8
  95. data/app/views/admin/pages/index.html.erb +6 -0
  96. data/app/views/admin/pages/new.html.erb +2 -5
  97. data/app/views/admin/pages/show.html.erb +2 -12
  98. data/app/views/admin/resources/_resources.html.erb +6 -5
  99. data/app/views/admin/resources/index.html.erb +12 -0
  100. data/app/views/admin/settings/feedback.html.erb +1 -19
  101. data/app/views/admin/settings/index.html.erb +3 -23
  102. data/app/views/admin/settings/podcast.html.erb +1 -10
  103. data/app/views/admin/settings/read.html.erb +1 -10
  104. data/app/views/admin/settings/spam.html.erb +1 -10
  105. data/app/views/admin/settings/write.html.erb +2 -14
  106. data/app/views/admin/shared/_edit.html.erb +1 -4
  107. data/app/views/admin/sidebar/index.html.erb +11 -8
  108. data/app/views/admin/tags/_form.html.erb +4 -0
  109. data/app/views/admin/tags/_tags.html.erb +19 -0
  110. data/app/views/admin/tags/destroy.html.erb +11 -0
  111. data/app/views/admin/tags/edit.html.erb +13 -0
  112. data/app/views/admin/tags/index.html.erb +12 -0
  113. data/app/views/admin/textfilters/edit.html.erb +3 -5
  114. data/app/views/admin/textfilters/index.html.erb +12 -0
  115. data/app/views/admin/textfilters/macro_help.html.erb +1 -1
  116. data/app/views/admin/textfilters/new.html.erb +2 -8
  117. data/app/views/admin/textfilters/show.html.erb +1 -6
  118. data/app/views/admin/textfilters/show_help.html.erb +1 -5
  119. data/app/views/admin/themes/index.html.erb +19 -15
  120. data/app/views/admin/trackbacks/edit.html.erb +1 -4
  121. data/app/views/admin/trackbacks/index.html.erb +22 -0
  122. data/app/views/admin/users/_form.html.erb +0 -10
  123. data/app/views/admin/users/edit.html.erb +3 -6
  124. data/app/views/admin/users/index.html.erb +29 -0
  125. data/app/views/admin/users/new.html.erb +1 -4
  126. data/app/views/articles/_atom_feed.atom.builder +1 -1
  127. data/app/views/articles/archives.html.erb +2 -2
  128. data/app/views/articles/groupings.html.erb +1 -1
  129. data/app/views/layouts/administration.html.erb +44 -51
  130. data/app/views/notification_mailer/_mail_footer.html.erb +1 -1
  131. data/app/views/notification_mailer/article.html.erb +1 -1
  132. data/app/views/notification_mailer/comment.html.erb +1 -1
  133. data/app/views/notification_mailer/notif_user.html.erb +12 -0
  134. data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder +1 -1
  135. data/config/environment.rb +0 -1
  136. data/config/environments/development.rb +5 -0
  137. data/config/initializers/access_rules.rb +110 -0
  138. data/config/initializers/active_record_hacks.rb +17 -0
  139. data/config/initializers/benchmark_hacks.rb +9 -0
  140. data/config/routes.rb +36 -15
  141. data/db/converters/README +2 -2
  142. data/db/migrate/004_add_sidebars.rb +8 -9
  143. data/db/migrate/067_remove_blog_ids.rb +22 -0
  144. data/db/migrate/068_fix_grants.rb +113 -0
  145. data/db/migrate/069_add_modules_to_profile.rb +18 -0
  146. data/db/schema.mysql-v3.sql +3 -217
  147. data/db/schema.mysql.sql +3 -217
  148. data/db/schema.postgresql.sql +3 -217
  149. data/db/schema.rb +32 -29
  150. data/db/schema.sqlite.sql +3 -217
  151. data/db/schema.sqlserver.sql +3 -231
  152. data/db/schema_version +1 -1
  153. data/lang/de_DE.rb +6 -9
  154. data/lang/en_US.rb +3 -0
  155. data/lang/es_MX.rb +556 -0
  156. data/lang/fr_FR.rb +171 -45
  157. data/lang/it_IT.rb +566 -0
  158. data/lang/ja_JP.rb +553 -0
  159. data/lang/pl_PL.rb +553 -0
  160. data/lang/ro_RO.rb +6 -10
  161. data/lib/sidebars/plugin.rb +1 -3
  162. data/lib/stateful.rb +6 -2
  163. data/lib/tasks/release.rake +3 -8
  164. data/lib/typo_version.rb +1 -1
  165. data/public/.DS_Store +0 -0
  166. data/public/.htaccess +1 -1
  167. data/public/images/admin/arrow_comment_group.gif +0 -0
  168. data/public/images/admin/typologo.gif +0 -0
  169. data/public/javascripts/controls.js +484 -354
  170. data/public/javascripts/dragdrop.js +88 -58
  171. data/public/javascripts/effects.js +396 -364
  172. data/public/javascripts/fckcustom.js +27 -0
  173. data/public/javascripts/fckeditor/editor/_source/classes/fckcontextmenu.js +209 -0
  174. data/public/javascripts/fckeditor/editor/_source/classes/fckdataprocessor.js +119 -0
  175. data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js +46 -0
  176. data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js +58 -0
  177. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange.js +808 -0
  178. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_gecko.js +103 -0
  179. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_ie.js +198 -0
  180. data/public/javascripts/fckeditor/editor/_source/classes/fckdomrangeiterator.js +306 -0
  181. data/public/javascripts/fckeditor/editor/_source/classes/fckeditingarea.js +344 -0
  182. data/public/javascripts/fckeditor/editor/_source/classes/fckelementpath.js +70 -0
  183. data/public/javascripts/fckeditor/editor/_source/classes/fckenterkey.js +629 -0
  184. data/public/javascripts/fckeditor/editor/_source/classes/fckevents.js +66 -0
  185. data/public/javascripts/fckeditor/editor/_source/classes/fckicon.js +103 -0
  186. data/public/javascripts/fckeditor/editor/_source/classes/fckiecleanup.js +68 -0
  187. data/public/javascripts/fckeditor/editor/_source/classes/fckimagepreloader.js +64 -0
  188. data/public/javascripts/fckeditor/editor/_source/classes/fckkeystrokehandler.js +141 -0
  189. data/public/javascripts/fckeditor/editor/_source/classes/fckmenublock.js +150 -0
  190. data/public/javascripts/fckeditor/editor/_source/classes/fckmenublockpanel.js +54 -0
  191. data/public/javascripts/fckeditor/editor/_source/classes/fckmenuitem.js +160 -0
  192. data/public/javascripts/fckeditor/editor/_source/classes/fckpanel.js +338 -0
  193. data/public/javascripts/fckeditor/editor/_source/classes/fckplugin.js +56 -0
  194. data/public/javascripts/fckeditor/editor/_source/classes/fckspecialcombo.js +377 -0
  195. data/public/javascripts/fckeditor/editor/_source/classes/fckstyle.js +1280 -0
  196. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbar.js +103 -0
  197. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js +36 -0
  198. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js +38 -0
  199. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbutton.js +76 -0
  200. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js +194 -0
  201. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js +139 -0
  202. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js +98 -0
  203. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js +76 -0
  204. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js +92 -0
  205. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js +143 -0
  206. data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js +200 -0
  207. data/public/javascripts/fckeditor/editor/_source/classes/fckw3crange.js +447 -0
  208. data/public/javascripts/fckeditor/editor/_source/classes/fckxml.js +108 -0
  209. data/public/javascripts/fckeditor/editor/_source/classes/fckxml_gecko.js +87 -0
  210. data/public/javascripts/fckeditor/editor/_source/classes/fckxml_ie.js +88 -0
  211. data/public/javascripts/fckeditor/editor/_source/commandclasses/fck_othercommands.js +462 -0
  212. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js +194 -0
  213. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js +59 -0
  214. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckfitwindow.js +180 -0
  215. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckindentcommands.js +280 -0
  216. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckjustifycommands.js +173 -0
  217. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcklistcommands.js +382 -0
  218. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcknamedcommand.js +37 -0
  219. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js +38 -0
  220. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js +40 -0
  221. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js +45 -0
  222. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckshowblocks.js +76 -0
  223. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js +39 -0
  224. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js +67 -0
  225. data/public/javascripts/fckeditor/editor/_source/commandclasses/fckstylecommand.js +60 -0
  226. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktablecommand.js +106 -0
  227. data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js +183 -0
  228. data/public/javascripts/fckeditor/editor/_source/fckconstants.js +56 -0
  229. data/public/javascripts/fckeditor/editor/_source/fckeditorapi.js +168 -0
  230. data/public/javascripts/fckeditor/editor/_source/fckjscoreextensions.js +166 -0
  231. data/public/javascripts/fckeditor/editor/_source/fckscriptloader.js +122 -0
  232. data/public/javascripts/fckeditor/editor/_source/internals/fck.js +1065 -0
  233. data/public/javascripts/fckeditor/editor/_source/internals/fck_contextmenu.js +325 -0
  234. data/public/javascripts/fckeditor/editor/_source/internals/fck_gecko.js +458 -0
  235. data/public/javascripts/fckeditor/editor/_source/internals/fck_ie.js +420 -0
  236. data/public/javascripts/fckeditor/editor/_source/internals/fckbrowserinfo.js +59 -0
  237. data/public/javascripts/fckeditor/editor/_source/internals/fckcodeformatter.js +100 -0
  238. data/public/javascripts/fckeditor/editor/_source/internals/fckcommands.js +167 -0
  239. data/public/javascripts/fckeditor/editor/_source/internals/fckconfig.js +239 -0
  240. data/public/javascripts/fckeditor/editor/_source/internals/fckdebug.js +56 -0
  241. data/public/javascripts/fckeditor/editor/_source/internals/fckdialog.js +38 -0
  242. data/public/javascripts/fckeditor/editor/_source/internals/fckdialog_gecko.js +103 -0
  243. data/public/javascripts/fckeditor/editor/_source/internals/fckdialog_ie.js +48 -0
  244. data/public/javascripts/fckeditor/editor/_source/internals/fckdocumentprocessor.js +225 -0
  245. data/public/javascripts/fckeditor/editor/_source/internals/fckdomtools.js +884 -0
  246. data/public/javascripts/fckeditor/editor/_source/internals/fcklanguagemanager.js +162 -0
  247. data/public/javascripts/fckeditor/editor/_source/internals/fcklisthandler.js +152 -0
  248. data/public/javascripts/fckeditor/editor/_source/internals/fcklistslib.js +60 -0
  249. data/public/javascripts/fckeditor/editor/_source/internals/fckplugins.js +46 -0
  250. data/public/javascripts/fckeditor/editor/_source/internals/fckregexlib.js +96 -0
  251. data/public/javascripts/fckeditor/editor/_source/internals/fckselection.js +42 -0
  252. data/public/javascripts/fckeditor/editor/_source/internals/fckselection_gecko.js +211 -0
  253. data/public/javascripts/fckeditor/editor/_source/internals/fckselection_ie.js +201 -0
  254. data/public/javascripts/fckeditor/editor/_source/internals/fckstyles.js +372 -0
  255. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler.js +858 -0
  256. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_gecko.js +56 -0
  257. data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_ie.js +64 -0
  258. data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbaritems.js +123 -0
  259. data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbarset.js +373 -0
  260. data/public/javascripts/fckeditor/editor/_source/internals/fcktools.js +581 -0
  261. data/public/javascripts/fckeditor/editor/_source/internals/fcktools_gecko.js +270 -0
  262. data/public/javascripts/fckeditor/editor/_source/internals/fcktools_ie.js +227 -0
  263. data/public/javascripts/fckeditor/editor/_source/internals/fckundo.js +220 -0
  264. data/public/javascripts/fckeditor/editor/_source/internals/fckurlparams.js +39 -0
  265. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml.js +460 -0
  266. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_gecko.js +105 -0
  267. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_ie.js +208 -0
  268. data/public/javascripts/fckeditor/editor/_source/internals/fckxhtmlentities.js +354 -0
  269. data/public/javascripts/fckeditor/editor/css/behaviors/disablehandles.htc +15 -0
  270. data/public/javascripts/fckeditor/editor/css/behaviors/showtableborders.htc +36 -0
  271. data/public/javascripts/fckeditor/editor/css/fck_editorarea.css +91 -0
  272. data/public/javascripts/fckeditor/editor/css/fck_internal.css +182 -0
  273. data/public/javascripts/fckeditor/editor/css/fck_showtableborders_gecko.css +42 -0
  274. data/public/javascripts/fckeditor/editor/css/images/block_address.png +0 -0
  275. data/public/javascripts/fckeditor/editor/css/images/block_blockquote.png +0 -0
  276. data/public/javascripts/fckeditor/editor/css/images/block_div.png +0 -0
  277. data/public/javascripts/fckeditor/editor/css/images/block_h1.png +0 -0
  278. data/public/javascripts/fckeditor/editor/css/images/block_h2.png +0 -0
  279. data/public/javascripts/fckeditor/editor/css/images/block_h3.png +0 -0
  280. data/public/javascripts/fckeditor/editor/css/images/block_h4.png +0 -0
  281. data/public/javascripts/fckeditor/editor/css/images/block_h5.png +0 -0
  282. data/public/javascripts/fckeditor/editor/css/images/block_h6.png +0 -0
  283. data/public/javascripts/fckeditor/editor/css/images/block_p.png +0 -0
  284. data/public/javascripts/fckeditor/editor/css/images/block_pre.png +0 -0
  285. data/public/javascripts/fckeditor/editor/css/images/fck_anchor.gif +0 -0
  286. data/public/javascripts/fckeditor/editor/css/images/fck_flashlogo.gif +0 -0
  287. data/public/javascripts/fckeditor/editor/css/images/fck_hiddenfield.gif +0 -0
  288. data/public/javascripts/fckeditor/editor/css/images/fck_pagebreak.gif +0 -0
  289. data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.css +78 -0
  290. data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.js +165 -0
  291. data/public/javascripts/fckeditor/editor/dialog/common/images/locked.gif +0 -0
  292. data/public/javascripts/fckeditor/editor/dialog/common/images/reset.gif +0 -0
  293. data/public/javascripts/fckeditor/editor/dialog/common/images/unlocked.gif +0 -0
  294. data/public/javascripts/fckeditor/editor/dialog/fck_about.html +155 -0
  295. data/public/javascripts/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif +0 -0
  296. data/public/javascripts/fckeditor/editor/dialog/fck_about/logo_fredck.gif +0 -0
  297. data/public/javascripts/fckeditor/editor/dialog/fck_anchor.html +207 -0
  298. data/public/javascripts/fckeditor/editor/dialog/fck_button.html +109 -0
  299. data/public/javascripts/fckeditor/editor/dialog/fck_checkbox.html +109 -0
  300. data/public/javascripts/fckeditor/editor/dialog/fck_colorselector.html +171 -0
  301. data/public/javascripts/fckeditor/editor/dialog/fck_docprops.html +600 -0
  302. data/public/javascripts/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html +113 -0
  303. data/public/javascripts/fckeditor/editor/dialog/fck_find.html +173 -0
  304. data/public/javascripts/fckeditor/editor/dialog/fck_flash.html +146 -0
  305. data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash.js +285 -0
  306. data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html +46 -0
  307. data/public/javascripts/fckeditor/editor/dialog/fck_form.html +106 -0
  308. data/public/javascripts/fckeditor/editor/dialog/fck_hiddenfield.html +118 -0
  309. data/public/javascripts/fckeditor/editor/dialog/fck_image.html +252 -0
  310. data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image.js +492 -0
  311. data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image_preview.html +66 -0
  312. data/public/javascripts/fckeditor/editor/dialog/fck_link.html +293 -0
  313. data/public/javascripts/fckeditor/editor/dialog/fck_link/fck_link.js +715 -0
  314. data/public/javascripts/fckeditor/editor/dialog/fck_listprop.html +116 -0
  315. data/public/javascripts/fckeditor/editor/dialog/fck_paste.html +340 -0
  316. data/public/javascripts/fckeditor/editor/dialog/fck_radiobutton.html +109 -0
  317. data/public/javascripts/fckeditor/editor/dialog/fck_replace.html +452 -0
  318. data/public/javascripts/fckeditor/editor/dialog/fck_select.html +177 -0
  319. data/public/javascripts/fckeditor/editor/dialog/fck_select/fck_select.js +194 -0
  320. data/public/javascripts/fckeditor/editor/dialog/fck_smiley.html +106 -0
  321. data/public/javascripts/fckeditor/editor/dialog/fck_source.html +65 -0
  322. data/public/javascripts/fckeditor/editor/dialog/fck_specialchar.html +118 -0
  323. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages.html +64 -0
  324. data/{spec/fixtures/notifications.yml → public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html} +0 -0
  325. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js +87 -0
  326. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html +153 -0
  327. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm +146 -0
  328. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php +196 -0
  329. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl +180 -0
  330. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js +462 -0
  331. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html +71 -0
  332. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css +49 -0
  333. data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js +272 -0
  334. data/public/javascripts/fckeditor/editor/dialog/fck_table.html +293 -0
  335. data/public/javascripts/fckeditor/editor/dialog/fck_tablecell.html +255 -0
  336. data/public/javascripts/fckeditor/editor/dialog/fck_template.html +242 -0
  337. data/public/javascripts/fckeditor/editor/dialog/fck_template/images/template1.gif +0 -0
  338. data/public/javascripts/fckeditor/editor/dialog/fck_template/images/template2.gif +0 -0
  339. data/public/javascripts/fckeditor/editor/dialog/fck_template/images/template3.gif +0 -0
  340. data/public/javascripts/fckeditor/editor/dialog/fck_textarea.html +95 -0
  341. data/public/javascripts/fckeditor/editor/dialog/fck_textfield.html +140 -0
  342. data/public/javascripts/fckeditor/editor/dtd/fck_dtd_test.html +43 -0
  343. data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10strict.js +116 -0
  344. data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10transitional.js +140 -0
  345. data/public/javascripts/fckeditor/editor/fckdebug.html +153 -0
  346. data/public/javascripts/fckeditor/editor/fckdialog.html +336 -0
  347. data/public/javascripts/fckeditor/editor/fckeditor.html +228 -0
  348. data/public/javascripts/fckeditor/editor/fckeditor.original.html +331 -0
  349. data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.css +89 -0
  350. data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.html +163 -0
  351. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmactualfolder.html +67 -0
  352. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html +113 -0
  353. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmfolders.html +196 -0
  354. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourceslist.html +167 -0
  355. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourcetype.html +65 -0
  356. data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmupload.html +114 -0
  357. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/ButtonArrow.gif +0 -0
  358. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/Folder.gif +0 -0
  359. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/Folder32.gif +0 -0
  360. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/FolderOpened.gif +0 -0
  361. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/FolderOpened32.gif +0 -0
  362. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/FolderUp.gif +0 -0
  363. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/ai.gif +0 -0
  364. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/avi.gif +0 -0
  365. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/bmp.gif +0 -0
  366. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/cs.gif +0 -0
  367. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif +0 -0
  368. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/dll.gif +0 -0
  369. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/doc.gif +0 -0
  370. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/exe.gif +0 -0
  371. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/fla.gif +0 -0
  372. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/gif.gif +0 -0
  373. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/htm.gif +0 -0
  374. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/html.gif +0 -0
  375. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/jpg.gif +0 -0
  376. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/js.gif +0 -0
  377. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/mdb.gif +0 -0
  378. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/mp3.gif +0 -0
  379. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/pdf.gif +0 -0
  380. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/png.gif +0 -0
  381. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/ppt.gif +0 -0
  382. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/rdp.gif +0 -0
  383. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/swf.gif +0 -0
  384. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/swt.gif +0 -0
  385. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/txt.gif +0 -0
  386. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/vsd.gif +0 -0
  387. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/xls.gif +0 -0
  388. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/xml.gif +0 -0
  389. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/zip.gif +0 -0
  390. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/ai.gif +0 -0
  391. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/avi.gif +0 -0
  392. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/bmp.gif +0 -0
  393. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/cs.gif +0 -0
  394. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif +0 -0
  395. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/dll.gif +0 -0
  396. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/doc.gif +0 -0
  397. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/exe.gif +0 -0
  398. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/fla.gif +0 -0
  399. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/gif.gif +0 -0
  400. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/htm.gif +0 -0
  401. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/html.gif +0 -0
  402. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/jpg.gif +0 -0
  403. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/js.gif +0 -0
  404. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/mdb.gif +0 -0
  405. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/mp3.gif +0 -0
  406. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/pdf.gif +0 -0
  407. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/png.gif +0 -0
  408. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/ppt.gif +0 -0
  409. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/rdp.gif +0 -0
  410. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/swf.gif +0 -0
  411. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/swt.gif +0 -0
  412. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/txt.gif +0 -0
  413. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/vsd.gif +0 -0
  414. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/xls.gif +0 -0
  415. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/xml.gif +0 -0
  416. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/zip.gif +0 -0
  417. data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/spacer.gif +0 -0
  418. data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/common.js +55 -0
  419. data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/fckxml.js +129 -0
  420. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/basexml.asp +62 -0
  421. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/class_upload.asp +353 -0
  422. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/commands.asp +198 -0
  423. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/config.asp +128 -0
  424. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/connector.asp +88 -0
  425. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/io.asp +222 -0
  426. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/upload.asp +61 -0
  427. data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/util.asp +55 -0
  428. data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/connector.aspx +30 -0
  429. data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/upload.aspx +30 -0
  430. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc +273 -0
  431. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm +315 -0
  432. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm +296 -0
  433. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm +68 -0
  434. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm +225 -0
  435. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm +89 -0
  436. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm +288 -0
  437. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm +68 -0
  438. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm +132 -0
  439. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/config.cfm +183 -0
  440. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/connector.cfm +31 -0
  441. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/image.cfc +1325 -0
  442. data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/upload.cfm +31 -0
  443. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/config.lasso +65 -0
  444. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/connector.lasso +257 -0
  445. data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/upload.lasso +157 -0
  446. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/basexml.pl +63 -0
  447. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/commands.pl +168 -0
  448. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/connector.cgi +137 -0
  449. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/io.pl +131 -0
  450. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload.cgi +118 -0
  451. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl +667 -0
  452. data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/util.pl +68 -0
  453. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/basexml.php +93 -0
  454. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/commands.php +245 -0
  455. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/config.php +140 -0
  456. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/connector.php +87 -0
  457. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/io.php +272 -0
  458. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/phpcompat.php +17 -0
  459. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/upload.php +59 -0
  460. data/public/javascripts/fckeditor/editor/filemanager/connectors/php/util.php +185 -0
  461. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/config.py +135 -0
  462. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/connector.py +118 -0
  463. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckcommands.py +181 -0
  464. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckconnector.py +90 -0
  465. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckoutput.py +111 -0
  466. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckutil.py +127 -0
  467. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/htaccess.txt +23 -0
  468. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/upload.py +88 -0
  469. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/wsgi.py +58 -0
  470. data/public/javascripts/fckeditor/editor/filemanager/connectors/py/zope.py +189 -0
  471. data/public/javascripts/fckeditor/editor/filemanager/connectors/test.html +177 -0
  472. data/public/javascripts/fckeditor/editor/filemanager/connectors/uploadtest.html +149 -0
  473. data/public/javascripts/fckeditor/editor/images/anchor.gif +0 -0
  474. data/public/javascripts/fckeditor/editor/images/arrow_ltr.gif +0 -0
  475. data/public/javascripts/fckeditor/editor/images/arrow_rtl.gif +0 -0
  476. data/public/javascripts/fckeditor/editor/images/smiley/msn/angel_smile.gif +0 -0
  477. data/public/javascripts/fckeditor/editor/images/smiley/msn/angry_smile.gif +0 -0
  478. data/public/javascripts/fckeditor/editor/images/smiley/msn/broken_heart.gif +0 -0
  479. data/public/javascripts/fckeditor/editor/images/smiley/msn/cake.gif +0 -0
  480. data/public/javascripts/fckeditor/editor/images/smiley/msn/confused_smile.gif +0 -0
  481. data/public/javascripts/fckeditor/editor/images/smiley/msn/cry_smile.gif +0 -0
  482. data/public/javascripts/fckeditor/editor/images/smiley/msn/devil_smile.gif +0 -0
  483. data/public/javascripts/fckeditor/editor/images/smiley/msn/embaressed_smile.gif +0 -0
  484. data/public/javascripts/fckeditor/editor/images/smiley/msn/envelope.gif +0 -0
  485. data/public/javascripts/fckeditor/editor/images/smiley/msn/heart.gif +0 -0
  486. data/public/javascripts/fckeditor/editor/images/smiley/msn/kiss.gif +0 -0
  487. data/public/javascripts/fckeditor/editor/images/smiley/msn/lightbulb.gif +0 -0
  488. data/public/javascripts/fckeditor/editor/images/smiley/msn/omg_smile.gif +0 -0
  489. data/public/javascripts/fckeditor/editor/images/smiley/msn/regular_smile.gif +0 -0
  490. data/public/javascripts/fckeditor/editor/images/smiley/msn/sad_smile.gif +0 -0
  491. data/public/javascripts/fckeditor/editor/images/smiley/msn/shades_smile.gif +0 -0
  492. data/public/javascripts/fckeditor/editor/images/smiley/msn/teeth_smile.gif +0 -0
  493. data/public/javascripts/fckeditor/editor/images/smiley/msn/thumbs_down.gif +0 -0
  494. data/public/javascripts/fckeditor/editor/images/smiley/msn/thumbs_up.gif +0 -0
  495. data/public/javascripts/fckeditor/editor/images/smiley/msn/tounge_smile.gif +0 -0
  496. data/public/javascripts/fckeditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif +0 -0
  497. data/public/javascripts/fckeditor/editor/images/smiley/msn/wink_smile.gif +0 -0
  498. data/{test/mocks/themes/standard_issue → public/javascripts/fckeditor/editor}/images/spacer.gif +0 -0
  499. data/public/javascripts/fckeditor/editor/js/fckeditorcode_gecko.js +108 -0
  500. data/public/javascripts/fckeditor/editor/js/fckeditorcode_ie.js +109 -0
  501. data/public/javascripts/fckeditor/editor/lang/_translationstatus.txt +76 -0
  502. data/public/javascripts/fckeditor/editor/lang/af.js +516 -0
  503. data/public/javascripts/fckeditor/editor/lang/ar.js +516 -0
  504. data/public/javascripts/fckeditor/editor/lang/bg.js +516 -0
  505. data/public/javascripts/fckeditor/editor/lang/bn.js +516 -0
  506. data/public/javascripts/fckeditor/editor/lang/bs.js +516 -0
  507. data/public/javascripts/fckeditor/editor/lang/ca.js +516 -0
  508. data/public/javascripts/fckeditor/editor/lang/cs.js +516 -0
  509. data/public/javascripts/fckeditor/editor/lang/da.js +516 -0
  510. data/public/javascripts/fckeditor/editor/lang/de.js +516 -0
  511. data/public/javascripts/fckeditor/editor/lang/el.js +516 -0
  512. data/public/javascripts/fckeditor/editor/lang/en-au.js +516 -0
  513. data/public/javascripts/fckeditor/editor/lang/en-ca.js +516 -0
  514. data/public/javascripts/fckeditor/editor/lang/en-uk.js +516 -0
  515. data/public/javascripts/fckeditor/editor/lang/en.js +516 -0
  516. data/public/javascripts/fckeditor/editor/lang/eo.js +516 -0
  517. data/public/javascripts/fckeditor/editor/lang/es.js +516 -0
  518. data/public/javascripts/fckeditor/editor/lang/et.js +516 -0
  519. data/public/javascripts/fckeditor/editor/lang/eu.js +517 -0
  520. data/public/javascripts/fckeditor/editor/lang/fa.js +516 -0
  521. data/public/javascripts/fckeditor/editor/lang/fi.js +516 -0
  522. data/public/javascripts/fckeditor/editor/lang/fo.js +516 -0
  523. data/public/javascripts/fckeditor/editor/lang/fr.js +516 -0
  524. data/public/javascripts/fckeditor/editor/lang/gl.js +516 -0
  525. data/public/javascripts/fckeditor/editor/lang/he.js +516 -0
  526. data/public/javascripts/fckeditor/editor/lang/hi.js +516 -0
  527. data/public/javascripts/fckeditor/editor/lang/hr.js +516 -0
  528. data/public/javascripts/fckeditor/editor/lang/hu.js +516 -0
  529. data/public/javascripts/fckeditor/editor/lang/it.js +516 -0
  530. data/public/javascripts/fckeditor/editor/lang/ja.js +516 -0
  531. data/public/javascripts/fckeditor/editor/lang/km.js +516 -0
  532. data/public/javascripts/fckeditor/editor/lang/ko.js +516 -0
  533. data/public/javascripts/fckeditor/editor/lang/lt.js +516 -0
  534. data/public/javascripts/fckeditor/editor/lang/lv.js +516 -0
  535. data/public/javascripts/fckeditor/editor/lang/mn.js +516 -0
  536. data/public/javascripts/fckeditor/editor/lang/ms.js +516 -0
  537. data/public/javascripts/fckeditor/editor/lang/nb.js +516 -0
  538. data/public/javascripts/fckeditor/editor/lang/nl.js +516 -0
  539. data/public/javascripts/fckeditor/editor/lang/no.js +516 -0
  540. data/public/javascripts/fckeditor/editor/lang/pl.js +516 -0
  541. data/public/javascripts/fckeditor/editor/lang/pt-br.js +516 -0
  542. data/public/javascripts/fckeditor/editor/lang/pt.js +516 -0
  543. data/public/javascripts/fckeditor/editor/lang/ro.js +516 -0
  544. data/public/javascripts/fckeditor/editor/lang/ru.js +516 -0
  545. data/public/javascripts/fckeditor/editor/lang/sk.js +516 -0
  546. data/public/javascripts/fckeditor/editor/lang/sl.js +516 -0
  547. data/public/javascripts/fckeditor/editor/lang/sr-latn.js +516 -0
  548. data/public/javascripts/fckeditor/editor/lang/sr.js +516 -0
  549. data/public/javascripts/fckeditor/editor/lang/sv.js +516 -0
  550. data/public/javascripts/fckeditor/editor/lang/th.js +516 -0
  551. data/public/javascripts/fckeditor/editor/lang/tr.js +516 -0
  552. data/public/javascripts/fckeditor/editor/lang/uk.js +516 -0
  553. data/public/javascripts/fckeditor/editor/lang/vi.js +516 -0
  554. data/public/javascripts/fckeditor/editor/lang/zh-cn.js +516 -0
  555. data/public/javascripts/fckeditor/editor/lang/zh.js +516 -0
  556. data/public/javascripts/fckeditor/editor/plugins/autogrow/fckplugin.js +92 -0
  557. data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.config.js +26 -0
  558. data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.html +67 -0
  559. data/public/javascripts/fckeditor/editor/plugins/bbcode/fckplugin.js +123 -0
  560. data/public/javascripts/fckeditor/editor/plugins/dragresizetable/fckplugin.js +503 -0
  561. data/public/javascripts/fckeditor/editor/plugins/placeholder/fck_placeholder.html +100 -0
  562. data/public/javascripts/fckeditor/editor/plugins/placeholder/fckplugin.js +187 -0
  563. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/de.js +27 -0
  564. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/en.js +27 -0
  565. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/fr.js +27 -0
  566. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/it.js +27 -0
  567. data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/pl.js +27 -0
  568. data/public/javascripts/fckeditor/editor/plugins/placeholder/placeholder.gif +0 -0
  569. data/public/javascripts/fckeditor/editor/plugins/simplecommands/fckplugin.js +29 -0
  570. data/public/javascripts/fckeditor/editor/plugins/tablecommands/fckplugin.js +33 -0
  571. data/public/javascripts/fckeditor/editor/skins/_fckviewstrips.html +121 -0
  572. data/public/javascripts/fckeditor/editor/skins/default/fck_dialog.css +139 -0
  573. data/public/javascripts/fckeditor/editor/skins/default/fck_editor.css +464 -0
  574. data/public/javascripts/fckeditor/editor/skins/default/fck_strip.gif +0 -0
  575. data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.arrowright.gif +0 -0
  576. data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif +0 -0
  577. data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.collapse.gif +0 -0
  578. data/{themes/standard_issue/images/spacer.gif → public/javascripts/fckeditor/editor/skins/default/images/toolbar.end.gif} +0 -0
  579. data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.expand.gif +0 -0
  580. data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.separator.gif +0 -0
  581. data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.start.gif +0 -0
  582. data/public/javascripts/fckeditor/editor/skins/office2003/fck_dialog.css +140 -0
  583. data/public/javascripts/fckeditor/editor/skins/office2003/fck_editor.css +476 -0
  584. data/public/javascripts/fckeditor/editor/skins/office2003/fck_strip.gif +0 -0
  585. data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.arrowright.gif +0 -0
  586. data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.bg.gif +0 -0
  587. data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.buttonarrow.gif +0 -0
  588. data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.collapse.gif +0 -0
  589. data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.end.gif +0 -0
  590. data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.expand.gif +0 -0
  591. data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.separator.gif +0 -0
  592. data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.start.gif +0 -0
  593. data/public/javascripts/fckeditor/editor/skins/silver/fck_dialog.css +143 -0
  594. data/public/javascripts/fckeditor/editor/skins/silver/fck_editor.css +473 -0
  595. data/public/javascripts/fckeditor/editor/skins/silver/fck_strip.gif +0 -0
  596. data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.arrowright.gif +0 -0
  597. data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.buttonarrow.gif +0 -0
  598. data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.buttonbg.gif +0 -0
  599. data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.collapse.gif +0 -0
  600. data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.end.gif +0 -0
  601. data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.expand.gif +0 -0
  602. data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.separator.gif +0 -0
  603. data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.start.gif +0 -0
  604. data/public/javascripts/fckeditor/fckconfig.js +306 -0
  605. data/public/javascripts/fckeditor/fckeditor.afp +161 -0
  606. data/public/javascripts/fckeditor/fckeditor.asp +235 -0
  607. data/public/javascripts/fckeditor/fckeditor.cfc +273 -0
  608. data/public/javascripts/fckeditor/fckeditor.cfm +210 -0
  609. data/public/javascripts/fckeditor/fckeditor.js +212 -0
  610. data/public/javascripts/fckeditor/fckeditor.lasso +112 -0
  611. data/public/javascripts/fckeditor/fckeditor.py +162 -0
  612. data/public/javascripts/fckeditor/fckpackager.xml +262 -0
  613. data/public/javascripts/fckeditor/fckstyles.xml +114 -0
  614. data/public/javascripts/fckeditor/fcktemplates.xml +103 -0
  615. data/public/javascripts/fckeditor/license.txt +1247 -0
  616. data/public/javascripts/lang/default.js +21 -0
  617. data/public/javascripts/lang/fr_FR.js +21 -0
  618. data/public/javascripts/lightbox.js +169 -315
  619. data/public/javascripts/prototype.js +2817 -1107
  620. data/public/javascripts/typo.js +51 -11
  621. data/public/stylesheets/administration.css +170 -94
  622. data/public/stylesheets/lightbox.css +59 -19
  623. data/public/stylesheets/typo_code.css +62 -0
  624. data/public/stylesheets/user-styles.css +16 -0
  625. data/spec/controllers/accounts_controller_spec.rb +2 -7
  626. data/spec/controllers/admin/article_preview_spec.rb +20 -0
  627. data/spec/controllers/admin/blacklist_controller_spec.rb +59 -0
  628. data/spec/controllers/admin/categories_controller_spec.rb +97 -0
  629. data/spec/controllers/admin/comments_controller_spec.rb +74 -0
  630. data/spec/controllers/admin/content_controller_spec.rb +212 -0
  631. data/spec/controllers/admin/feedback_controller_spec.rb +45 -0
  632. data/spec/controllers/admin/pages_controller_spec.rb +83 -0
  633. data/spec/controllers/admin/profiles_controller_spec.rb +13 -0
  634. data/spec/controllers/admin/resources_controller_spec.rb +46 -0
  635. data/spec/controllers/admin/settings_controller_spec.rb +22 -0
  636. data/spec/controllers/admin/textfilters_controller_spec.rb +24 -0
  637. data/spec/controllers/admin/themes_controller_spec.rb +30 -0
  638. data/spec/controllers/admin/trackbacks_controller_spec.rb +57 -0
  639. data/spec/controllers/admin/users_controller_spec.rb +65 -0
  640. data/spec/controllers/articles_controller_spec.rb +4 -8
  641. data/spec/controllers/authors_controller_spec.rb +2 -2
  642. data/spec/controllers/backend_controller_spec.rb +318 -0
  643. data/spec/controllers/categories_controller_spec.rb +2 -2
  644. data/spec/controllers/comments_controller_spec.rb +8 -20
  645. data/spec/controllers/redirect_controller_spec.rb +35 -0
  646. data/spec/controllers/tags_controller_spec.rb +2 -2
  647. data/spec/controllers/textfilter_controller_spec.rb +264 -0
  648. data/spec/controllers/theme_controller_spec.rb +43 -0
  649. data/spec/controllers/xml_controller_spec.rb +232 -0
  650. data/spec/models/article_closing_spec.rb +38 -0
  651. data/spec/models/article_spec.rb +285 -9
  652. data/spec/models/blacklist_pattern_spec.rb +12 -0
  653. data/spec/models/blog_spec.rb +10 -4
  654. data/spec/models/cache_support_spec.rb +0 -4
  655. data/spec/models/category_spec.rb +1 -5
  656. data/spec/models/comment_spec.rb +186 -0
  657. data/spec/models/configuration_spec.rb +7 -9
  658. data/spec/models/content_state/feedback_states_spec.rb +64 -0
  659. data/spec/models/notification_spec.rb +8 -0
  660. data/spec/models/page_spec.rb +2 -10
  661. data/spec/models/ping_pinger_spec.rb +33 -0
  662. data/spec/models/ping_spec.rb +2 -9
  663. data/spec/models/resource_spec.rb +0 -2
  664. data/spec/models/route_cache_spec.rb +11 -0
  665. data/spec/models/sidebar_spec.rb +7 -0
  666. data/spec/models/tag_spec.rb +19 -8
  667. data/spec/models/theme_spec.rb +6 -7
  668. data/spec/models/trackback_spec.rb +1 -1
  669. data/spec/models/trigger_spec.rb +0 -2
  670. data/spec/models/typo_deprecated_spec.rb +18 -0
  671. data/spec/models/url_policy_spec.rb +65 -0
  672. data/spec/models/user_spec.rb +9 -4
  673. data/spec/spec.opts +2 -5
  674. data/spec/spec_helper.rb +5 -2
  675. data/spec/views/comments/html_sanitization_spec.rb +0 -14
  676. data/test/fixtures/blacklist_patterns.yml +1 -3
  677. data/test/fixtures/blogs.yml +2 -44
  678. data/test/fixtures/categories.yml +0 -6
  679. data/test/fixtures/categorizations.yml +17 -17
  680. data/test/fixtures/contents.yml +15 -53
  681. data/test/fixtures/feedback.yml +11 -31
  682. data/test/fixtures/profiles.yml +9 -0
  683. data/test/fixtures/redirects.yml +0 -3
  684. data/test/fixtures/resources.yml +3 -6
  685. data/test/fixtures/sidebars.yml +0 -2
  686. data/test/fixtures/tags.yml +3 -6
  687. data/test/fixtures/text_filters.yml +1 -6
  688. data/test/fixtures/users.yml +0 -10
  689. data/test/mocks/themes/typographic/.DS_Store +0 -0
  690. data/test/mocks/themes/typographic/about.markdown +7 -0
  691. data/test/mocks/themes/typographic/images/Thumbs.db +0 -0
  692. data/test/mocks/themes/typographic/images/accept.png +0 -0
  693. data/test/mocks/themes/typographic/images/accept50.png +0 -0
  694. data/test/mocks/themes/typographic/images/bg_body.jpg +0 -0
  695. data/test/mocks/themes/typographic/images/bg_white.png +0 -0
  696. data/test/mocks/themes/typographic/images/bg_wrapper.jpg +0 -0
  697. data/test/mocks/themes/typographic/images/bullet_bottom.png +0 -0
  698. data/test/mocks/themes/typographic/images/bullet_right.png +0 -0
  699. data/test/mocks/themes/typographic/images/email_open.png +0 -0
  700. data/test/mocks/themes/typographic/images/email_open50.png +0 -0
  701. data/test/mocks/themes/typographic/images/meta.png +0 -0
  702. data/test/mocks/themes/typographic/images/page_edit.png +0 -0
  703. data/test/mocks/themes/typographic/images/page_edit50.png +0 -0
  704. data/test/mocks/themes/typographic/images/tag.png +0 -0
  705. data/test/mocks/themes/typographic/images/user.png +0 -0
  706. data/test/mocks/themes/typographic/images/user50.png +0 -0
  707. data/test/mocks/themes/typographic/images/world_link.png +0 -0
  708. data/test/mocks/themes/typographic/images/world_link50.png +0 -0
  709. data/test/mocks/themes/typographic/layouts/default.html.erb +42 -0
  710. data/test/mocks/themes/typographic/preview.png +0 -0
  711. data/test/mocks/themes/typographic/stylesheets/colors.css +51 -0
  712. data/test/mocks/themes/typographic/stylesheets/layout.css +346 -0
  713. data/test/mocks/themes/typographic/stylesheets/reset.css +5 -0
  714. data/test/mocks/themes/typographic/stylesheets/style.css +36 -0
  715. data/test/mocks/themes/typographic/views/articles/_article.html.erb +41 -0
  716. data/test/mocks/themes/typographic/views/articles/_comment.html.erb +14 -0
  717. data/test/mocks/themes/typographic/views/articles/_comment_form.html.erb +48 -0
  718. data/test/mocks/themes/typographic/views/articles/_comment_list.html.erb +7 -0
  719. data/test/mocks/themes/typographic/views/articles/_trackback.html.erb +9 -0
  720. data/test/mocks/themes/typographic/views/articles/comment_preview.html.erb +10 -0
  721. data/test/mocks/themes/typographic/views/articles/index.html.erb +5 -0
  722. data/test/mocks/themes/typographic/views/articles/read.html.erb +42 -0
  723. data/test/mocks/themes/typographic/views/shared/_search.html.erb +17 -0
  724. data/test/mocks/themes/typographic/views/theme/static_view_test.html.erb +1 -0
  725. data/test/test_helper.rb +4 -0
  726. data/themes/scribbish/layouts/default.html.erb +4 -2
  727. data/themes/scribbish/stylesheets/content.css +1 -0
  728. data/themes/scribbish/views/articles/_article.html.erb +6 -6
  729. data/themes/scribbish/views/articles/_comment.html.erb +1 -1
  730. data/themes/scribbish/views/articles/_comment_form.html.erb +10 -10
  731. data/themes/scribbish/views/articles/_comment_list.html.erb +1 -1
  732. data/themes/scribbish/views/articles/_trackback.html.erb +1 -1
  733. data/themes/scribbish/views/articles/comment_preview.html.erb +1 -1
  734. data/themes/scribbish/views/articles/index.html.erb +1 -1
  735. data/themes/scribbish/views/articles/read.html.erb +4 -4
  736. data/themes/scribbish/views/shared/_search.html.erb +1 -1
  737. data/themes/typographic/.DS_Store +0 -0
  738. data/themes/typographic/about.markdown +7 -0
  739. data/themes/typographic/images/accept.png +0 -0
  740. data/themes/typographic/images/accept50.png +0 -0
  741. data/themes/typographic/images/bg_body.jpg +0 -0
  742. data/themes/typographic/images/bg_white.png +0 -0
  743. data/themes/typographic/images/bg_wrapper.jpg +0 -0
  744. data/themes/typographic/images/bullet_bottom.png +0 -0
  745. data/themes/typographic/images/bullet_right.png +0 -0
  746. data/themes/typographic/images/email_open.png +0 -0
  747. data/themes/typographic/images/email_open50.png +0 -0
  748. data/themes/typographic/images/meta.png +0 -0
  749. data/themes/typographic/images/page_edit.png +0 -0
  750. data/themes/typographic/images/page_edit50.png +0 -0
  751. data/themes/typographic/images/tag.png +0 -0
  752. data/themes/typographic/images/user.png +0 -0
  753. data/themes/typographic/images/user50.png +0 -0
  754. data/themes/typographic/images/world_link.png +0 -0
  755. data/themes/typographic/images/world_link50.png +0 -0
  756. data/themes/typographic/layouts/default.html.erb +42 -0
  757. data/themes/typographic/preview.png +0 -0
  758. data/themes/typographic/stylesheets/colors.css +51 -0
  759. data/themes/typographic/stylesheets/layout.css +346 -0
  760. data/themes/typographic/stylesheets/reset.css +5 -0
  761. data/themes/typographic/stylesheets/style.css +36 -0
  762. data/themes/typographic/views/articles/_article.html.erb +41 -0
  763. data/themes/typographic/views/articles/_comment.html.erb +14 -0
  764. data/themes/typographic/views/articles/_comment_form.html.erb +48 -0
  765. data/themes/typographic/views/articles/_comment_list.html.erb +7 -0
  766. data/themes/typographic/views/articles/_trackback.html.erb +9 -0
  767. data/themes/typographic/views/articles/comment_preview.html.erb +10 -0
  768. data/themes/typographic/views/articles/index.html.erb +5 -0
  769. data/themes/typographic/views/articles/read.html.erb +42 -0
  770. data/themes/typographic/views/shared/_search.html.erb +17 -0
  771. data/themes/typographic/views/theme/static_view_test.html.erb +1 -0
  772. data/themes/typographic2/.DS_Store +0 -0
  773. data/themes/typographic2/about.markdown +7 -0
  774. data/themes/typographic2/images/Thumbs.db +0 -0
  775. data/themes/typographic2/images/accept.png +0 -0
  776. data/themes/typographic2/images/accept50.png +0 -0
  777. data/themes/typographic2/images/bg_body.jpg +0 -0
  778. data/themes/typographic2/images/bg_white.png +0 -0
  779. data/themes/typographic2/images/bg_wrapper.jpg +0 -0
  780. data/themes/typographic2/images/bullet_bottom.png +0 -0
  781. data/themes/typographic2/images/bullet_right.png +0 -0
  782. data/themes/typographic2/images/email_open.png +0 -0
  783. data/themes/typographic2/images/email_open50.png +0 -0
  784. data/themes/typographic2/images/meta.png +0 -0
  785. data/themes/typographic2/images/page_edit.png +0 -0
  786. data/themes/typographic2/images/page_edit50.png +0 -0
  787. data/themes/typographic2/images/tag.png +0 -0
  788. data/themes/typographic2/images/user.png +0 -0
  789. data/themes/typographic2/images/user50.png +0 -0
  790. data/themes/typographic2/images/world_link.png +0 -0
  791. data/themes/typographic2/images/world_link50.png +0 -0
  792. data/themes/typographic2/layouts/default.html.erb +42 -0
  793. data/themes/typographic2/preview.png +0 -0
  794. data/themes/typographic2/stylesheets/colors.css +51 -0
  795. data/themes/typographic2/stylesheets/layout.css +346 -0
  796. data/themes/typographic2/stylesheets/reset.css +5 -0
  797. data/themes/typographic2/stylesheets/style.css +36 -0
  798. data/themes/typographic2/views/articles/_article.html.erb +41 -0
  799. data/themes/typographic2/views/articles/_comment.html.erb +14 -0
  800. data/themes/typographic2/views/articles/_comment_form.html.erb +48 -0
  801. data/themes/typographic2/views/articles/_comment_list.html.erb +7 -0
  802. data/themes/typographic2/views/articles/_trackback.html.erb +9 -0
  803. data/themes/typographic2/views/articles/comment_preview.html.erb +10 -0
  804. data/themes/typographic2/views/articles/index.html.erb +5 -0
  805. data/themes/typographic2/views/articles/read.html.erb +42 -0
  806. data/themes/typographic2/views/shared/_search.html.erb +17 -0
  807. data/themes/{standard_issue → typographic2}/views/theme/static_view_test.html.erb +0 -0
  808. data/vendor/plugins/archives_sidebar/lib/archives_sidebar.rb +1 -1
  809. data/vendor/plugins/auto_complete/README +23 -0
  810. data/vendor/plugins/auto_complete/Rakefile +22 -0
  811. data/vendor/plugins/auto_complete/init.rb +2 -0
  812. data/vendor/plugins/auto_complete/lib/auto_complete.rb +47 -0
  813. data/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb +143 -0
  814. data/vendor/plugins/auto_complete/test/auto_complete_test.rb +67 -0
  815. data/vendor/plugins/datestamped_resources/lib/datestamped_resources.rb +2 -1
  816. data/vendor/plugins/fckeditor/CHANGELOG +3 -0
  817. data/vendor/plugins/fckeditor/README +125 -0
  818. data/vendor/plugins/fckeditor/Rakefile +72 -0
  819. data/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb +158 -0
  820. data/vendor/plugins/fckeditor/app/helpers/fckeditor_helper.rb +4 -0
  821. data/vendor/plugins/fckeditor/app/views/fckeditor/spell_check.rhtml +52 -0
  822. data/vendor/plugins/fckeditor/init.rb +35 -0
  823. data/vendor/plugins/fckeditor/install.rb +12 -0
  824. data/vendor/plugins/fckeditor/lib/fckeditor.rb +101 -0
  825. data/vendor/plugins/fckeditor/lib/fckeditor_file_utils.rb +81 -0
  826. data/vendor/plugins/fckeditor/lib/fckeditor_spell_check.rb +43 -0
  827. data/vendor/plugins/fckeditor/lib/fckeditor_version.rb +9 -0
  828. data/vendor/plugins/fckeditor/tasks/fckeditor_tasks.rake +97 -0
  829. data/vendor/plugins/rspec/.autotest +3 -0
  830. data/vendor/plugins/rspec/CHANGES +33 -1
  831. data/vendor/plugins/rspec/README +2 -3
  832. data/vendor/plugins/rspec/Rakefile +7 -5
  833. data/vendor/plugins/rspec/bin/spec +1 -0
  834. data/vendor/plugins/rspec/examples/pure/helper_method_example.rb +9 -6
  835. data/vendor/plugins/rspec/failing_examples/README.txt +7 -0
  836. data/vendor/plugins/rspec/failing_examples/failing_autogenerated_docstrings_example.rb +19 -0
  837. data/vendor/plugins/rspec/lib/autotest/rspec.rb +36 -56
  838. data/vendor/plugins/rspec/lib/spec.rb +0 -7
  839. data/vendor/plugins/rspec/lib/spec/example/example_group_methods.rb +10 -4
  840. data/vendor/plugins/rspec/lib/spec/example/example_methods.rb +13 -8
  841. data/vendor/plugins/rspec/lib/spec/interop/test.rb +3 -1
  842. data/vendor/plugins/rspec/lib/spec/interop/test/unit/ui/console/testrunner.rb +1 -0
  843. data/vendor/plugins/rspec/lib/spec/matchers.rb +1 -7
  844. data/vendor/plugins/rspec/lib/spec/matchers/be.rb +3 -2
  845. data/vendor/plugins/rspec/lib/spec/matchers/have.rb +3 -0
  846. data/vendor/plugins/rspec/lib/spec/matchers/raise_error.rb +19 -15
  847. data/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb +10 -3
  848. data/vendor/plugins/rspec/lib/spec/runner.rb +14 -0
  849. data/vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb +6 -2
  850. data/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb +15 -7
  851. data/vendor/plugins/rspec/lib/spec/runner/option_parser.rb +5 -33
  852. data/vendor/plugins/rspec/lib/spec/runner/options.rb +51 -18
  853. data/vendor/plugins/rspec/lib/spec/runner/spec_parser.rb +49 -31
  854. data/vendor/plugins/rspec/lib/spec/story/extensions.rb +2 -0
  855. data/vendor/plugins/rspec/lib/spec/story/extensions/regexp.rb +9 -0
  856. data/vendor/plugins/rspec/lib/spec/story/extensions/string.rb +9 -0
  857. data/vendor/plugins/rspec/lib/spec/story/runner.rb +0 -2
  858. data/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb +8 -8
  859. data/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb +2 -1
  860. data/vendor/plugins/rspec/lib/spec/story/step.rb +18 -8
  861. data/vendor/plugins/rspec/lib/spec/story/world.rb +1 -0
  862. data/vendor/plugins/rspec/lib/spec/version.rb +22 -22
  863. data/vendor/plugins/rspec/pre_commit/lib/pre_commit.rb +4 -0
  864. data/vendor/plugins/rspec/pre_commit/lib/pre_commit/core.rb +50 -0
  865. data/vendor/plugins/rspec/pre_commit/lib/pre_commit/pre_commit.rb +54 -0
  866. data/vendor/plugins/rspec/pre_commit/lib/pre_commit/rspec.rb +111 -0
  867. data/vendor/plugins/rspec/pre_commit/lib/pre_commit/rspec_on_rails.rb +313 -0
  868. data/vendor/plugins/rspec/pre_commit/spec/pre_commit/pre_commit_spec.rb +15 -0
  869. data/vendor/plugins/rspec/pre_commit/spec/pre_commit/rspec_on_rails_spec.rb +36 -0
  870. data/vendor/plugins/rspec/pre_commit/spec/spec_helper.rb +3 -0
  871. data/vendor/plugins/rspec/pre_commit/spec/spec_suite.rb +11 -0
  872. data/vendor/plugins/rspec/report.html +4358 -0
  873. data/vendor/plugins/rspec/spec/README.jruby +1 -0
  874. data/vendor/plugins/rspec/spec/autotest/rspec_spec.rb +15 -84
  875. data/vendor/plugins/rspec/spec/autotest_helper.rb +2 -1
  876. data/vendor/plugins/rspec/spec/autotest_matchers.rb +47 -0
  877. data/vendor/plugins/rspec/spec/rspec_suite.rb +1 -1
  878. data/vendor/plugins/rspec/{spec.opts → spec/spec.opts} +0 -0
  879. data/vendor/plugins/rspec/spec/spec/example/example_group_methods_spec.rb +11 -2
  880. data/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb +70 -41
  881. data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_that_fails.rb +10 -0
  882. data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_that_passes.rb +10 -0
  883. data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_with_errors.rb +10 -0
  884. data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_that_fails.rb +10 -0
  885. data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_that_passes.rb +10 -0
  886. data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_with_errors.rb +10 -0
  887. data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/testsuite_adapter_spec_with_test_unit.rb +38 -0
  888. data/vendor/plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb +45 -0
  889. data/vendor/plugins/rspec/spec/spec/interop/test/unit/test_unit_spec_helper.rb +1 -1
  890. data/vendor/plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb +40 -5
  891. data/vendor/plugins/rspec/spec/spec/interop/test/unit/testsuite_adapter_spec.rb +2 -2
  892. data/vendor/plugins/rspec/spec/spec/matchers/have_spec.rb +19 -0
  893. data/vendor/plugins/rspec/spec/spec/matchers/match_spec.rb +3 -3
  894. data/vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb +7 -1
  895. data/vendor/plugins/rspec/spec/spec/mocks/bug_report_10263.rb +1 -1
  896. data/vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb +3 -2
  897. data/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html +381 -0
  898. data/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb +5 -0
  899. data/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb +97 -51
  900. data/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb +50 -49
  901. data/vendor/plugins/rspec/spec/spec/runner/options_spec.rb +72 -2
  902. data/vendor/plugins/rspec/spec/spec/runner/resources/a_bar.rb +0 -0
  903. data/vendor/plugins/rspec/spec/spec/runner/resources/a_foo.rb +0 -0
  904. data/vendor/plugins/rspec/spec/spec/runner/resources/a_spec.rb +1 -0
  905. data/vendor/plugins/rspec/spec/spec/runner/spec_parser/spec_parser_fixture.rb +70 -0
  906. data/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb +31 -76
  907. data/vendor/plugins/rspec/spec/spec/spec_classes.rb +7 -0
  908. data/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb +37 -0
  909. data/vendor/plugins/rspec/spec/spec/story/step_spec.rb +53 -0
  910. data/vendor/plugins/rspec/spec/spec/story/world_spec.rb +7 -0
  911. data/vendor/plugins/rspec/stories/example_groups/autogenerated_docstrings +27 -8
  912. data/vendor/plugins/rspec/stories/example_groups/output +5 -0
  913. data/vendor/plugins/rspec/stories/interop/test_case_with_should_methods +1 -1
  914. data/vendor/plugins/rspec/stories/resources/stories/failing_story.rb +15 -0
  915. data/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts +0 -1
  916. data/vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb +1 -2
  917. data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb +1 -3
  918. data/vendor/plugins/rspec_on_rails/lib/autotest/discover.rb +1 -0
  919. data/vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb +47 -47
  920. data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb +14 -4
  921. data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/functional_example_group.rb +4 -4
  922. data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/helper_example_group.rb +0 -1
  923. data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/rails_example_group.rb +8 -0
  924. data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/view_example_group.rb +4 -5
  925. data/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb +2 -2
  926. data/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb +4 -0
  927. data/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb +23 -23
  928. data/vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb +14 -17
  929. data/vendor/plugins/rspec_on_rails/spec/rails/example/controller_spec_spec.rb +13 -0
  930. data/vendor/plugins/rspec_on_rails/spec/rails/example/view_spec_spec.rb +15 -1
  931. data/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb +37 -26
  932. data/vendor/plugins/rspec_on_rails/spec/rails/matchers/have_text_spec.rb +62 -0
  933. data/vendor/plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb +73 -36
  934. data/vendor/plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb +9 -1
  935. data/vendor/plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb +4 -0
  936. data/vendor/plugins/rspec_on_rails/stories/all.rb +4 -0
  937. data/vendor/plugins/rspec_on_rails/tasks/rspec.rake +10 -8
  938. data/vendor/plugins/static_sidebar/lib/static_sidebar.rb +4 -8
  939. data/vendor/plugins/typo_converter/README +71 -0
  940. data/vendor/plugins/typo_converter/Rakefile +22 -0
  941. data/vendor/plugins/typo_converter/init.rb +8 -0
  942. data/vendor/plugins/typo_converter/lib/converters/base.rb +249 -0
  943. data/vendor/plugins/typo_converter/lib/converters/dotclear.rb +98 -0
  944. data/vendor/plugins/typo_converter/lib/converters/dotclear/category.rb +7 -0
  945. data/vendor/plugins/typo_converter/lib/converters/dotclear/comment.rb +8 -0
  946. data/vendor/plugins/typo_converter/lib/converters/dotclear/post.rb +9 -0
  947. data/vendor/plugins/typo_converter/lib/converters/dotclear/user.rb +8 -0
  948. data/vendor/plugins/typo_converter/lib/converters/dotclear_2.rb +122 -0
  949. data/vendor/plugins/typo_converter/lib/converters/dotclear_2/category.rb +11 -0
  950. data/vendor/plugins/typo_converter/lib/converters/dotclear_2/comment.rb +13 -0
  951. data/vendor/plugins/typo_converter/lib/converters/dotclear_2/post.rb +15 -0
  952. data/vendor/plugins/typo_converter/lib/converters/dotclear_2/tag.rb +13 -0
  953. data/vendor/plugins/typo_converter/lib/converters/dotclear_2/user.rb +13 -0
  954. data/vendor/plugins/typo_converter/lib/converters/wp25.rb +128 -0
  955. data/vendor/plugins/typo_converter/lib/converters/wp25/comment.rb +12 -0
  956. data/vendor/plugins/typo_converter/lib/converters/wp25/post.rb +37 -0
  957. data/vendor/plugins/typo_converter/lib/converters/wp25/term.rb +11 -0
  958. data/vendor/plugins/typo_converter/lib/converters/wp25/term_relationship.rb +13 -0
  959. data/vendor/plugins/typo_converter/lib/converters/wp25/term_taxonomy.rb +19 -0
  960. data/vendor/plugins/typo_converter/lib/converters/wp25/user.rb +12 -0
  961. data/vendor/plugins/typo_converter/tasks/typo_converters_tasks.rake +4 -0
  962. data/vendor/plugins/typo_login_system/init.rb +2 -0
  963. data/vendor/plugins/typo_login_system/lib/access_control.rb +159 -0
  964. data/vendor/plugins/typo_login_system/lib/login_system.rb +90 -0
  965. data/vendor/plugins/xml_sidebar/lib/xml_sidebar.rb +1 -1
  966. metadata +823 -527
  967. data/CHANGES-5.0 +0 -82
  968. data/TODO.MULTIUSERS +0 -45
  969. data/app/views/admin/advanced/index.html.erb +0 -20
  970. data/app/views/admin/blacklist/list.html.erb +0 -13
  971. data/app/views/admin/cache/list.html.erb +0 -8
  972. data/app/views/admin/categories/list.html.erb +0 -18
  973. data/app/views/admin/categories/show.html.erb +0 -37
  974. data/app/views/admin/comments/comments.html.erb +0 -4
  975. data/app/views/admin/comments/list.html.erb +0 -37
  976. data/app/views/admin/comments/new.html.erb +0 -19
  977. data/app/views/admin/content/_show_categories.html.erb +0 -9
  978. data/app/views/admin/content/list.html.erb +0 -21
  979. data/app/views/admin/content/preview.html.erb +0 -10
  980. data/app/views/admin/feedback/list.html.erb +0 -48
  981. data/app/views/admin/pages/list.html.erb +0 -12
  982. data/app/views/admin/pages/preview.html.erb +0 -1
  983. data/app/views/admin/resources/list.html.erb +0 -17
  984. data/app/views/admin/textfilters/list.html.erb +0 -16
  985. data/app/views/admin/trackbacks/list.html.erb +0 -31
  986. data/app/views/admin/trackbacks/new.html.erb +0 -15
  987. data/app/views/admin/users/list.html.erb +0 -32
  988. data/app/views/admin/users/show.html.erb +0 -23
  989. data/app/views/layouts/minimal.html.erb +0 -145
  990. data/db/converters/wordpress.rb +0 -187
  991. data/db/converters/wordpress2.rb +0 -291
  992. data/lib/jabber_notify.rb +0 -37
  993. data/lib/login_system.rb +0 -85
  994. data/lib/tasks/rcov.rake +0 -38
  995. data/public/images/admin/bgdivider.gif +0 -0
  996. data/public/images/admin/bgoff2.png +0 -0
  997. data/public/images/admin/bgon.png +0 -0
  998. data/public/images/admin/foot.jpg +0 -0
  999. data/public/images/admin/table-header-last.png +0 -0
  1000. data/public/images/admin/table-header.png +0 -0
  1001. data/public/images/admin/top.gif +0 -0
  1002. data/public/images/admin/typo.gif +0 -0
  1003. data/public/images/admin/typologo.png +0 -0
  1004. data/public/images/bracket.gif +0 -0
  1005. data/public/images/header.jpg +0 -0
  1006. data/public/images/loading.gif +0 -0
  1007. data/public/javascripts/tiny_mce/langs/en.js +0 -154
  1008. data/public/javascripts/tiny_mce/license.txt +0 -504
  1009. data/public/javascripts/tiny_mce/plugins/advimage/css/advimage.css +0 -13
  1010. data/public/javascripts/tiny_mce/plugins/advimage/editor_plugin.js +0 -1
  1011. data/public/javascripts/tiny_mce/plugins/advimage/editor_plugin_src.js +0 -49
  1012. data/public/javascripts/tiny_mce/plugins/advimage/image.htm +0 -237
  1013. data/public/javascripts/tiny_mce/plugins/advimage/img/sample.gif +0 -0
  1014. data/public/javascripts/tiny_mce/plugins/advimage/js/image.js +0 -403
  1015. data/public/javascripts/tiny_mce/plugins/advimage/langs/en_dlg.js +0 -43
  1016. data/public/javascripts/tiny_mce/plugins/advlink/css/advlink.css +0 -8
  1017. data/public/javascripts/tiny_mce/plugins/advlink/editor_plugin.js +0 -1
  1018. data/public/javascripts/tiny_mce/plugins/advlink/editor_plugin_src.js +0 -58
  1019. data/public/javascripts/tiny_mce/plugins/advlink/js/advlink.js +0 -551
  1020. data/public/javascripts/tiny_mce/plugins/advlink/langs/en_dlg.js +0 -52
  1021. data/public/javascripts/tiny_mce/plugins/advlink/link.htm +0 -339
  1022. data/public/javascripts/tiny_mce/plugins/autosave/editor_plugin.js +0 -1
  1023. data/public/javascripts/tiny_mce/plugins/autosave/editor_plugin_src.js +0 -51
  1024. data/public/javascripts/tiny_mce/plugins/contextmenu/editor_plugin.js +0 -1
  1025. data/public/javascripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +0 -84
  1026. data/public/javascripts/tiny_mce/plugins/emotions/editor_plugin.js +0 -1
  1027. data/public/javascripts/tiny_mce/plugins/emotions/editor_plugin_src.js +0 -40
  1028. data/public/javascripts/tiny_mce/plugins/emotions/emotions.htm +0 -41
  1029. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cool.gif +0 -0
  1030. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cry.gif +0 -0
  1031. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif +0 -0
  1032. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif +0 -0
  1033. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-frown.gif +0 -0
  1034. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif +0 -0
  1035. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif +0 -0
  1036. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif +0 -0
  1037. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif +0 -0
  1038. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif +0 -0
  1039. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-smile.gif +0 -0
  1040. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif +0 -0
  1041. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif +0 -0
  1042. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif +0 -0
  1043. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-wink.gif +0 -0
  1044. data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-yell.gif +0 -0
  1045. data/public/javascripts/tiny_mce/plugins/emotions/js/emotions.js +0 -22
  1046. data/public/javascripts/tiny_mce/plugins/emotions/langs/en_dlg.js +0 -20
  1047. data/public/javascripts/tiny_mce/plugins/media/css/content.css +0 -6
  1048. data/public/javascripts/tiny_mce/plugins/media/css/media.css +0 -68
  1049. data/public/javascripts/tiny_mce/plugins/media/editor_plugin.js +0 -1
  1050. data/public/javascripts/tiny_mce/plugins/media/editor_plugin_src.js +0 -323
  1051. data/public/javascripts/tiny_mce/plugins/media/img/flash.gif +0 -0
  1052. data/public/javascripts/tiny_mce/plugins/media/img/flv_player.swf +0 -0
  1053. data/public/javascripts/tiny_mce/plugins/media/img/quicktime.gif +0 -0
  1054. data/public/javascripts/tiny_mce/plugins/media/img/realmedia.gif +0 -0
  1055. data/public/javascripts/tiny_mce/plugins/media/img/shockwave.gif +0 -0
  1056. data/public/javascripts/tiny_mce/plugins/media/img/trans.gif +0 -0
  1057. data/public/javascripts/tiny_mce/plugins/media/img/windowsmedia.gif +0 -0
  1058. data/public/javascripts/tiny_mce/plugins/media/js/embed.js +0 -73
  1059. data/public/javascripts/tiny_mce/plugins/media/js/media.js +0 -616
  1060. data/public/javascripts/tiny_mce/plugins/media/langs/en_dlg.js +0 -103
  1061. data/public/javascripts/tiny_mce/plugins/media/media.htm +0 -823
  1062. data/public/javascripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +0 -1
  1063. data/public/javascripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +0 -50
  1064. data/public/javascripts/tiny_mce/plugins/paste/blank.htm +0 -22
  1065. data/public/javascripts/tiny_mce/plugins/paste/css/blank.css +0 -14
  1066. data/public/javascripts/tiny_mce/plugins/paste/css/pasteword.css +0 -3
  1067. data/public/javascripts/tiny_mce/plugins/paste/editor_plugin.js +0 -1
  1068. data/public/javascripts/tiny_mce/plugins/paste/editor_plugin_src.js +0 -382
  1069. data/public/javascripts/tiny_mce/plugins/paste/js/pastetext.js +0 -42
  1070. data/public/javascripts/tiny_mce/plugins/paste/js/pasteword.js +0 -56
  1071. data/public/javascripts/tiny_mce/plugins/paste/langs/en_dlg.js +0 -5
  1072. data/public/javascripts/tiny_mce/plugins/paste/pastetext.htm +0 -34
  1073. data/public/javascripts/tiny_mce/plugins/paste/pasteword.htm +0 -29
  1074. data/public/javascripts/tiny_mce/plugins/safari/blank.htm +0 -1
  1075. data/public/javascripts/tiny_mce/plugins/safari/editor_plugin.js +0 -1
  1076. data/public/javascripts/tiny_mce/plugins/safari/editor_plugin_src.js +0 -401
  1077. data/public/javascripts/tiny_mce/plugins/save/editor_plugin.js +0 -1
  1078. data/public/javascripts/tiny_mce/plugins/save/editor_plugin_src.js +0 -103
  1079. data/public/javascripts/tiny_mce/themes/advanced/about.htm +0 -56
  1080. data/public/javascripts/tiny_mce/themes/advanced/anchor.htm +0 -32
  1081. data/public/javascripts/tiny_mce/themes/advanced/charmap.htm +0 -53
  1082. data/public/javascripts/tiny_mce/themes/advanced/color_picker.htm +0 -74
  1083. data/public/javascripts/tiny_mce/themes/advanced/editor_template.js +0 -1
  1084. data/public/javascripts/tiny_mce/themes/advanced/editor_template_src.js +0 -990
  1085. data/public/javascripts/tiny_mce/themes/advanced/image.htm +0 -86
  1086. data/public/javascripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
  1087. data/public/javascripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
  1088. data/public/javascripts/tiny_mce/themes/advanced/js/about.js +0 -76
  1089. data/public/javascripts/tiny_mce/themes/advanced/js/anchor.js +0 -30
  1090. data/public/javascripts/tiny_mce/themes/advanced/js/charmap.js +0 -327
  1091. data/public/javascripts/tiny_mce/themes/advanced/js/color_picker.js +0 -245
  1092. data/public/javascripts/tiny_mce/themes/advanced/js/image.js +0 -232
  1093. data/public/javascripts/tiny_mce/themes/advanced/js/link.js +0 -110
  1094. data/public/javascripts/tiny_mce/themes/advanced/js/source_editor.js +0 -62
  1095. data/public/javascripts/tiny_mce/themes/advanced/langs/en.js +0 -62
  1096. data/public/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +0 -51
  1097. data/public/javascripts/tiny_mce/themes/advanced/link.htm +0 -64
  1098. data/public/javascripts/tiny_mce/themes/advanced/skins/default/content.css +0 -18
  1099. data/public/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +0 -111
  1100. data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
  1101. data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
  1102. data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif +0 -0
  1103. data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif +0 -0
  1104. data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/progress.gif +0 -0
  1105. data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
  1106. data/public/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +0 -193
  1107. data/public/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +0 -18
  1108. data/public/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +0 -111
  1109. data/public/javascripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
  1110. data/public/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +0 -193
  1111. data/public/javascripts/tiny_mce/themes/advanced/source_editor.htm +0 -32
  1112. data/public/javascripts/tiny_mce/themes/simple/editor_template.js +0 -1
  1113. data/public/javascripts/tiny_mce/themes/simple/editor_template_src.js +0 -85
  1114. data/public/javascripts/tiny_mce/themes/simple/img/icons.gif +0 -0
  1115. data/public/javascripts/tiny_mce/themes/simple/langs/en.js +0 -11
  1116. data/public/javascripts/tiny_mce/themes/simple/skins/default/content.css +0 -25
  1117. data/public/javascripts/tiny_mce/themes/simple/skins/default/ui.css +0 -32
  1118. data/public/javascripts/tiny_mce/themes/simple/skins/o2k7/content.css +0 -17
  1119. data/public/javascripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png +0 -0
  1120. data/public/javascripts/tiny_mce/themes/simple/skins/o2k7/ui.css +0 -35
  1121. data/public/javascripts/tiny_mce/tiny_mce.js +0 -1
  1122. data/public/javascripts/tiny_mce/tiny_mce_popup.js +0 -221
  1123. data/public/javascripts/tiny_mce/tiny_mce_src.js +0 -8803
  1124. data/public/javascripts/tiny_mce/utils/editable_selects.js +0 -61
  1125. data/public/javascripts/tiny_mce/utils/form_utils.js +0 -193
  1126. data/public/javascripts/tiny_mce/utils/mclayer.js +0 -210
  1127. data/public/javascripts/tiny_mce/utils/mctabs.js +0 -74
  1128. data/public/javascripts/tiny_mce/utils/validate.js +0 -219
  1129. data/public/stylesheets/minimal.css +0 -143
  1130. data/spec/fixtures/blacklist_patterns.yml +0 -10
  1131. data/spec/fixtures/blogs.yml +0 -77
  1132. data/spec/fixtures/categories.yml +0 -35
  1133. data/spec/fixtures/categorizations.yml +0 -31
  1134. data/spec/fixtures/contents.yml +0 -205
  1135. data/spec/fixtures/feedback.yml +0 -159
  1136. data/spec/fixtures/page_caches.yml +0 -7
  1137. data/spec/fixtures/profiles.yml +0 -11
  1138. data/spec/fixtures/redirects.yml +0 -13
  1139. data/spec/fixtures/resources.yml +0 -24
  1140. data/spec/fixtures/sidebars.yml +0 -12
  1141. data/spec/fixtures/tags.yml +0 -10
  1142. data/spec/fixtures/text_filters.yml +0 -42
  1143. data/spec/fixtures/triggers.yml +0 -1
  1144. data/spec/fixtures/users.yml +0 -56
  1145. data/spec/helpers/comments_helper_spec.rb +0 -11
  1146. data/test/fixtures/articles_tags.yml +0 -19
  1147. data/test/functional/accounts_controller_test.rb +0 -78
  1148. data/test/functional/admin/article_preview_test.rb +0 -82
  1149. data/test/functional/admin/blacklist_controller_test.rb +0 -63
  1150. data/test/functional/admin/categories_controller_test.rb +0 -106
  1151. data/test/functional/admin/comments_controller_test.rb +0 -78
  1152. data/test/functional/admin/content_controller_test.rb +0 -232
  1153. data/test/functional/admin/feedback_controller_test.rb +0 -59
  1154. data/test/functional/admin/pages_controller_test.rb +0 -88
  1155. data/test/functional/admin/profiles_controller_test.rb +0 -18
  1156. data/test/functional/admin/resources_controller_test.rb +0 -49
  1157. data/test/functional/admin/settings_controller_test.rb +0 -26
  1158. data/test/functional/admin/textfilters_controller_test.rb +0 -29
  1159. data/test/functional/admin/themes_controller_test.rb +0 -34
  1160. data/test/functional/admin/trackbacks_controller_test.rb +0 -76
  1161. data/test/functional/admin/users_controller_test.rb +0 -78
  1162. data/test/functional/articles_controller_test.rb +0 -263
  1163. data/test/functional/backend_controller_test.rb +0 -287
  1164. data/test/functional/redirect_controller_test.rb +0 -40
  1165. data/test/functional/textfilter_controller_test.rb +0 -273
  1166. data/test/functional/theme_controller_test.rb +0 -45
  1167. data/test/functional/xml_controller_test.rb +0 -235
  1168. data/test/mocks/themes/standard_issue/about.markdown +0 -5
  1169. data/test/mocks/themes/standard_issue/images/img01.gif +0 -0
  1170. data/test/mocks/themes/standard_issue/images/img02.gif +0 -0
  1171. data/test/mocks/themes/standard_issue/images/img03.gif +0 -0
  1172. data/test/mocks/themes/standard_issue/images/img04.jpg +0 -0
  1173. data/test/mocks/themes/standard_issue/images/img05.gif +0 -0
  1174. data/test/mocks/themes/standard_issue/images/img06.gif +0 -0
  1175. data/test/mocks/themes/standard_issue/images/img07.gif +0 -0
  1176. data/test/mocks/themes/standard_issue/images/img08.gif +0 -0
  1177. data/test/mocks/themes/standard_issue/images/img09.gif +0 -0
  1178. data/test/mocks/themes/standard_issue/images/img10.gif +0 -0
  1179. data/test/mocks/themes/standard_issue/images/spinner.gif +0 -0
  1180. data/test/mocks/themes/standard_issue/layouts/default.html.erb +0 -61
  1181. data/test/mocks/themes/standard_issue/preview.png +0 -0
  1182. data/test/mocks/themes/standard_issue/stylesheets/application.css +0 -461
  1183. data/test/mocks/themes/standard_issue/views/articles/_article.html.erb +0 -32
  1184. data/test/mocks/themes/standard_issue/views/articles/_comment.html.erb +0 -12
  1185. data/test/mocks/themes/standard_issue/views/articles/_comment_form.html.erb +0 -48
  1186. data/test/mocks/themes/standard_issue/views/articles/_comment_list.html.erb +0 -7
  1187. data/test/mocks/themes/standard_issue/views/articles/_trackback.html.erb +0 -9
  1188. data/test/mocks/themes/standard_issue/views/articles/comment_preview.html.erb +0 -10
  1189. data/test/mocks/themes/standard_issue/views/articles/index.html.erb +0 -5
  1190. data/test/mocks/themes/standard_issue/views/articles/read.html.erb +0 -42
  1191. data/test/mocks/themes/standard_issue/views/shared/_search.html.erb +0 -17
  1192. data/test/mocks/themes/standard_issue/views/theme/static_view_test.rhtml +0 -1
  1193. data/test/unit/amazon_sidebar_test.rb +0 -36
  1194. data/test/unit/article_closing_test.rb +0 -40
  1195. data/test/unit/article_test.rb +0 -304
  1196. data/test/unit/assumptions_tests.rb +0 -54
  1197. data/test/unit/blacklist_pattern_test.rb +0 -14
  1198. data/test/unit/blog_test.rb +0 -52
  1199. data/test/unit/cache_support_test.rb +0 -62
  1200. data/test/unit/category_test.rb +0 -42
  1201. data/test/unit/comment_test.rb +0 -188
  1202. data/test/unit/configuration_test.rb +0 -21
  1203. data/test/unit/content_state/feedback_states_test.rb +0 -67
  1204. data/test/unit/metafragment_test.rb +0 -63
  1205. data/test/unit/notification_mailer_test.rb +0 -55
  1206. data/test/unit/notification_test.rb +0 -10
  1207. data/test/unit/page_test.rb +0 -45
  1208. data/test/unit/ping_pinger_test.rb +0 -30
  1209. data/test/unit/ping_test.rb +0 -127
  1210. data/test/unit/redirect_test.rb +0 -19
  1211. data/test/unit/resource_test.rb +0 -71
  1212. data/test/unit/route_cache_test.rb +0 -11
  1213. data/test/unit/sidebar_test.rb +0 -9
  1214. data/test/unit/static_sidebar_test.rb +0 -19
  1215. data/test/unit/tag_test.rb +0 -71
  1216. data/test/unit/text_filter_test.rb +0 -126
  1217. data/test/unit/theme_test.rb +0 -44
  1218. data/test/unit/trackback_test.rb +0 -22
  1219. data/test/unit/trigger_test.rb +0 -40
  1220. data/test/unit/typo_deprecated_test.rb +0 -22
  1221. data/test/unit/user_test.rb +0 -111
  1222. data/themes/dirtylicious/about.markdown +0 -3
  1223. data/themes/dirtylicious/images/body.jpg +0 -0
  1224. data/themes/dirtylicious/images/container.jpg +0 -0
  1225. data/themes/dirtylicious/images/gravatar.gif +0 -0
  1226. data/themes/dirtylicious/images/header.jpg +0 -0
  1227. data/themes/dirtylicious/images/li.gif +0 -0
  1228. data/themes/dirtylicious/images/main.gif +0 -0
  1229. data/themes/dirtylicious/images/nav.gif +0 -0
  1230. data/themes/dirtylicious/images/quote.gif +0 -0
  1231. data/themes/dirtylicious/images/spinner.gif +0 -0
  1232. data/themes/dirtylicious/layouts/default.html.erb +0 -60
  1233. data/themes/dirtylicious/preview.png +0 -0
  1234. data/themes/dirtylicious/stylesheets/application.css +0 -327
  1235. data/themes/dirtylicious/views/articles/_article.html.erb +0 -33
  1236. data/themes/dirtylicious/views/articles/_comment.html.erb +0 -14
  1237. data/themes/dirtylicious/views/articles/_comment_form.html.erb +0 -37
  1238. data/themes/dirtylicious/views/articles/_comment_list.html.erb +0 -7
  1239. data/themes/dirtylicious/views/articles/_trackback.html.erb +0 -9
  1240. data/themes/dirtylicious/views/articles/comment_preview.html.erb +0 -10
  1241. data/themes/dirtylicious/views/articles/index.html.erb +0 -5
  1242. data/themes/dirtylicious/views/articles/read.html.erb +0 -42
  1243. data/themes/dirtylicious/views/shared/_search.html.erb +0 -16
  1244. data/themes/standard_issue/about.markdown +0 -5
  1245. data/themes/standard_issue/images/img01.gif +0 -0
  1246. data/themes/standard_issue/images/img02.gif +0 -0
  1247. data/themes/standard_issue/images/img03.gif +0 -0
  1248. data/themes/standard_issue/images/img04.jpg +0 -0
  1249. data/themes/standard_issue/images/img05.gif +0 -0
  1250. data/themes/standard_issue/images/img06.gif +0 -0
  1251. data/themes/standard_issue/images/img07.gif +0 -0
  1252. data/themes/standard_issue/images/img08.gif +0 -0
  1253. data/themes/standard_issue/images/img09.gif +0 -0
  1254. data/themes/standard_issue/images/img10.gif +0 -0
  1255. data/themes/standard_issue/images/spinner.gif +0 -0
  1256. data/themes/standard_issue/layouts/default.html.erb +0 -59
  1257. data/themes/standard_issue/preview.png +0 -0
  1258. data/themes/standard_issue/stylesheets/application.css +0 -461
  1259. data/themes/standard_issue/views/articles/_article.html.erb +0 -32
  1260. data/themes/standard_issue/views/articles/_comment.html.erb +0 -12
  1261. data/themes/standard_issue/views/articles/_comment_form.html.erb +0 -48
  1262. data/themes/standard_issue/views/articles/_comment_list.html.erb +0 -7
  1263. data/themes/standard_issue/views/articles/_trackback.html.erb +0 -9
  1264. data/themes/standard_issue/views/articles/comment_preview.html.erb +0 -10
  1265. data/themes/standard_issue/views/articles/index.html.erb +0 -5
  1266. data/themes/standard_issue/views/articles/read.html.erb +0 -42
  1267. data/themes/standard_issue/views/shared/_search.html.erb +0 -17
  1268. data/vendor/jabber4r/CHANGES +0 -8
  1269. data/vendor/jabber4r/LICENSE.txt +0 -12
  1270. data/vendor/jabber4r/README +0 -180
  1271. data/vendor/jabber4r/Rakefile.rb +0 -143
  1272. data/vendor/jabber4r/lib/jabber4r/jabber4r.rb +0 -22
  1273. data/vendor/jabber4r/lib/jabber4r/jid.rb +0 -93
  1274. data/vendor/jabber4r/lib/jabber4r/protocol.rb +0 -1384
  1275. data/vendor/jabber4r/lib/jabber4r/rexml_1.8_patch.rb +0 -16
  1276. data/vendor/jabber4r/lib/jabber4r/roster.rb +0 -322
  1277. data/vendor/jabber4r/lib/jabber4r/session.rb +0 -615
  1278. data/vendor/jabber4r/lib/jabber4r/vcard.rb +0 -42
  1279. data/vendor/plugins/haml/MIT-LICENSE +0 -20
  1280. data/vendor/plugins/haml/REFERENCE +0 -662
  1281. data/vendor/plugins/haml/Rakefile +0 -171
  1282. data/vendor/plugins/haml/VERSION +0 -1
  1283. data/vendor/plugins/haml/bin/haml +0 -18
  1284. data/vendor/plugins/haml/init.rb +0 -3
  1285. data/vendor/plugins/haml/lib/haml/buffer.rb +0 -224
  1286. data/vendor/plugins/haml/lib/haml/engine.rb +0 -557
  1287. data/vendor/plugins/haml/lib/haml/helpers.rb +0 -220
  1288. data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +0 -54
  1289. data/vendor/plugins/haml/lib/haml/template.rb +0 -138
  1290. data/vendor/plugins/haml/test/benchmark.rb +0 -62
  1291. data/vendor/plugins/haml/test/engine_test.rb +0 -93
  1292. data/vendor/plugins/haml/test/helper_test.rb +0 -105
  1293. data/vendor/plugins/haml/test/mocks/article.rb +0 -6
  1294. data/vendor/plugins/haml/test/profile.rb +0 -45
  1295. data/vendor/plugins/haml/test/results/content_for_layout.xhtml +0 -16
  1296. data/vendor/plugins/haml/test/results/eval_suppressed.xhtml +0 -2
  1297. data/vendor/plugins/haml/test/results/helpers.xhtml +0 -50
  1298. data/vendor/plugins/haml/test/results/helpful.xhtml +0 -5
  1299. data/vendor/plugins/haml/test/results/just_stuff.xhtml +0 -38
  1300. data/vendor/plugins/haml/test/results/list.xhtml +0 -12
  1301. data/vendor/plugins/haml/test/results/original_engine.xhtml +0 -24
  1302. data/vendor/plugins/haml/test/results/partials.xhtml +0 -20
  1303. data/vendor/plugins/haml/test/results/silent_script.xhtml +0 -74
  1304. data/vendor/plugins/haml/test/results/standard.xhtml +0 -42
  1305. data/vendor/plugins/haml/test/results/tag_parsing.xhtml +0 -28
  1306. data/vendor/plugins/haml/test/results/very_basic.xhtml +0 -7
  1307. data/vendor/plugins/haml/test/results/whitespace_handling.xhtml +0 -51
  1308. data/vendor/plugins/haml/test/rhtml/standard.rhtml +0 -51
  1309. data/vendor/plugins/haml/test/runner.rb +0 -15
  1310. data/vendor/plugins/haml/test/template_test.rb +0 -137
  1311. data/vendor/plugins/haml/test/templates/_partial.haml +0 -7
  1312. data/vendor/plugins/haml/test/templates/_text_area.haml +0 -3
  1313. data/vendor/plugins/haml/test/templates/content_for_layout.haml +0 -10
  1314. data/vendor/plugins/haml/test/templates/eval_suppressed.haml +0 -5
  1315. data/vendor/plugins/haml/test/templates/helpers.haml +0 -39
  1316. data/vendor/plugins/haml/test/templates/helpful.haml +0 -6
  1317. data/vendor/plugins/haml/test/templates/just_stuff.haml +0 -34
  1318. data/vendor/plugins/haml/test/templates/list.haml +0 -12
  1319. data/vendor/plugins/haml/test/templates/original_engine.haml +0 -17
  1320. data/vendor/plugins/haml/test/templates/partialize.haml +0 -1
  1321. data/vendor/plugins/haml/test/templates/partials.haml +0 -12
  1322. data/vendor/plugins/haml/test/templates/silent_script.haml +0 -40
  1323. data/vendor/plugins/haml/test/templates/standard.haml +0 -40
  1324. data/vendor/plugins/haml/test/templates/tag_parsing.haml +0 -24
  1325. data/vendor/plugins/haml/test/templates/very_basic.haml +0 -4
  1326. data/vendor/plugins/haml/test/templates/whitespace_handling.haml +0 -66
  1327. data/vendor/plugins/rspec/spec/spec/interop/test/unit/testcase_spec_with_test_unit.rb +0 -20
  1328. data/vendor/plugins/rspec/spec/spec/interop/test/unit/testsuite_adapter_spec_with_test_unit.rb +0 -34
  1329. data/vendor/plugins/rspec_on_rails/generators/helpers/rails_identifier.rb +0 -16
  1330. data/vendor/plugins/tiny_mce/README +0 -10
  1331. data/vendor/plugins/tiny_mce/Rakefile +0 -22
  1332. data/vendor/plugins/tiny_mce/TODO +0 -2
  1333. data/vendor/plugins/tiny_mce/changelog +0 -1017
  1334. data/vendor/plugins/tiny_mce/init.rb +0 -3
  1335. data/vendor/plugins/tiny_mce/install.rb +0 -1
  1336. data/vendor/plugins/tiny_mce/lib/tiny_mce.rb +0 -36
  1337. data/vendor/plugins/tiny_mce/lib/tiny_mce_helper.rb +0 -48
  1338. data/vendor/plugins/tiny_mce/tasks/tiny_mce.rake +0 -40
  1339. data/vendor/plugins/tiny_mce/test/helper_testcase.rb +0 -38
  1340. data/vendor/plugins/tiny_mce/test/tiny_mce_helper_test.rb +0 -67
  1341. data/vendor/plugins/tiny_mce/test/tiny_mce_test.rb +0 -85
  1342. data/vendor/plugins/tiny_mce/tiny_mce_options.yml +0 -121
@@ -1,10 +1,10 @@
1
- // Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
2
- // (c) 2005, 2006 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
1
+ // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
2
+ // (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
3
3
  //
4
4
  // script.aculo.us is freely distributable under the terms of an MIT-style license.
5
5
  // For details, see the script.aculo.us web site: http://script.aculo.us/
6
6
 
7
- if(typeof Effect == 'undefined')
7
+ if(Object.isUndefined(Effect))
8
8
  throw("dragdrop.js requires including script.aculo.us' effects.js library");
9
9
 
10
10
  var Droppables = {
@@ -20,14 +20,13 @@ var Droppables = {
20
20
  greedy: true,
21
21
  hoverclass: null,
22
22
  tree: false
23
- }, arguments[1] || {});
23
+ }, arguments[1] || { });
24
24
 
25
25
  // cache containers
26
26
  if(options.containment) {
27
27
  options._containers = [];
28
28
  var containment = options.containment;
29
- if((typeof containment == 'object') &&
30
- (containment.constructor == Array)) {
29
+ if(Object.isArray(containment)) {
31
30
  containment.each( function(c) { options._containers.push($(c)) });
32
31
  } else {
33
32
  options._containers.push($(containment));
@@ -87,21 +86,23 @@ var Droppables = {
87
86
 
88
87
  show: function(point, element) {
89
88
  if(!this.drops.length) return;
90
- var affected = [];
89
+ var drop, affected = [];
91
90
 
92
- if(this.last_active) this.deactivate(this.last_active);
93
91
  this.drops.each( function(drop) {
94
92
  if(Droppables.isAffected(point, element, drop))
95
93
  affected.push(drop);
96
94
  });
97
95
 
98
- if(affected.length>0) {
96
+ if(affected.length>0)
99
97
  drop = Droppables.findDeepestChild(affected);
98
+
99
+ if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
100
+ if (drop) {
100
101
  Position.within(drop.element, point[0], point[1]);
101
102
  if(drop.onHover)
102
103
  drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
103
104
 
104
- Droppables.activate(drop);
105
+ if (drop != this.last_active) Droppables.activate(drop);
105
106
  }
106
107
  },
107
108
 
@@ -110,8 +111,10 @@ var Droppables = {
110
111
  Position.prepare();
111
112
 
112
113
  if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
113
- if (this.last_active.onDrop)
114
- this.last_active.onDrop(element, this.last_active.element, event);
114
+ if (this.last_active.onDrop) {
115
+ this.last_active.onDrop(element, this.last_active.element, event);
116
+ return true;
117
+ }
115
118
  },
116
119
 
117
120
  reset: function() {
@@ -219,10 +222,7 @@ var Draggables = {
219
222
 
220
223
  /*--------------------------------------------------------------------------*/
221
224
 
222
- var Draggable = Class.create();
223
- Draggable._dragging = {};
224
-
225
- Draggable.prototype = {
225
+ var Draggable = Class.create({
226
226
  initialize: function(element) {
227
227
  var defaults = {
228
228
  handle: false,
@@ -233,7 +233,7 @@ Draggable.prototype = {
233
233
  });
234
234
  },
235
235
  endeffect: function(element) {
236
- var toOpacity = typeof element._opacity == 'number' ? element._opacity : 1.0;
236
+ var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
237
237
  new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
238
238
  queue: {scope:'_draggable', position:'end'},
239
239
  afterFinish: function(){
@@ -243,6 +243,7 @@ Draggable.prototype = {
243
243
  },
244
244
  zindex: 1000,
245
245
  revert: false,
246
+ quiet: false,
246
247
  scroll: false,
247
248
  scrollSensitivity: 20,
248
249
  scrollSpeed: 15,
@@ -250,7 +251,7 @@ Draggable.prototype = {
250
251
  delay: 0
251
252
  };
252
253
 
253
- if(!arguments[1] || typeof arguments[1].endeffect == 'undefined')
254
+ if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
254
255
  Object.extend(defaults, {
255
256
  starteffect: function(element) {
256
257
  element._opacity = Element.getOpacity(element);
@@ -259,11 +260,11 @@ Draggable.prototype = {
259
260
  }
260
261
  });
261
262
 
262
- var options = Object.extend(defaults, arguments[1] || {});
263
+ var options = Object.extend(defaults, arguments[1] || { });
263
264
 
264
265
  this.element = $(element);
265
266
 
266
- if(options.handle && (typeof options.handle == 'string'))
267
+ if(options.handle && Object.isString(options.handle))
267
268
  this.handle = this.element.down('.'+options.handle, 0);
268
269
 
269
270
  if(!this.handle) this.handle = $(options.handle);
@@ -276,7 +277,6 @@ Draggable.prototype = {
276
277
 
277
278
  Element.makePositioned(this.element); // fix IE
278
279
 
279
- this.delta = this.currentDelta();
280
280
  this.options = options;
281
281
  this.dragging = false;
282
282
 
@@ -298,17 +298,17 @@ Draggable.prototype = {
298
298
  },
299
299
 
300
300
  initDrag: function(event) {
301
- if(typeof Draggable._dragging[this.element] != 'undefined' &&
301
+ if(!Object.isUndefined(Draggable._dragging[this.element]) &&
302
302
  Draggable._dragging[this.element]) return;
303
303
  if(Event.isLeftClick(event)) {
304
304
  // abort on form elements, fixes a Firefox issue
305
305
  var src = Event.element(event);
306
- if(src.tagName && (
307
- src.tagName=='INPUT' ||
308
- src.tagName=='SELECT' ||
309
- src.tagName=='OPTION' ||
310
- src.tagName=='BUTTON' ||
311
- src.tagName=='TEXTAREA')) return;
306
+ if((tag_name = src.tagName.toUpperCase()) && (
307
+ tag_name=='INPUT' ||
308
+ tag_name=='SELECT' ||
309
+ tag_name=='OPTION' ||
310
+ tag_name=='BUTTON' ||
311
+ tag_name=='TEXTAREA')) return;
312
312
 
313
313
  var pointer = [Event.pointerX(event), Event.pointerY(event)];
314
314
  var pos = Position.cumulativeOffset(this.element);
@@ -321,6 +321,8 @@ Draggable.prototype = {
321
321
 
322
322
  startDrag: function(event) {
323
323
  this.dragging = true;
324
+ if(!this.delta)
325
+ this.delta = this.currentDelta();
324
326
 
325
327
  if(this.options.zindex) {
326
328
  this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
@@ -329,7 +331,9 @@ Draggable.prototype = {
329
331
 
330
332
  if(this.options.ghosting) {
331
333
  this._clone = this.element.cloneNode(true);
332
- Position.absolutize(this.element);
334
+ this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
335
+ if (!this.element._originallyAbsolute)
336
+ Position.absolutize(this.element);
333
337
  this.element.parentNode.insertBefore(this._clone, this.element);
334
338
  }
335
339
 
@@ -351,8 +355,12 @@ Draggable.prototype = {
351
355
 
352
356
  updateDrag: function(event, pointer) {
353
357
  if(!this.dragging) this.startDrag(event);
354
- Position.prepare();
355
- Droppables.show(pointer, this.element);
358
+
359
+ if(!this.options.quiet){
360
+ Position.prepare();
361
+ Droppables.show(pointer, this.element);
362
+ }
363
+
356
364
  Draggables.notify('onDrag', this, event);
357
365
 
358
366
  this.draw(pointer);
@@ -380,30 +388,44 @@ Draggable.prototype = {
380
388
  }
381
389
 
382
390
  // fix AppleWebKit rendering
383
- if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
391
+ if(Prototype.Browser.WebKit) window.scrollBy(0,0);
384
392
 
385
393
  Event.stop(event);
386
394
  },
387
395
 
388
396
  finishDrag: function(event, success) {
389
397
  this.dragging = false;
398
+
399
+ if(this.options.quiet){
400
+ Position.prepare();
401
+ var pointer = [Event.pointerX(event), Event.pointerY(event)];
402
+ Droppables.show(pointer, this.element);
403
+ }
390
404
 
391
405
  if(this.options.ghosting) {
392
- Position.relativize(this.element);
406
+ if (!this.element._originallyAbsolute)
407
+ Position.relativize(this.element);
408
+ delete this.element._originallyAbsolute;
393
409
  Element.remove(this._clone);
394
410
  this._clone = null;
395
411
  }
396
412
 
397
- if(success) Droppables.fire(event, this.element);
413
+ var dropped = false;
414
+ if(success) {
415
+ dropped = Droppables.fire(event, this.element);
416
+ if (!dropped) dropped = false;
417
+ }
418
+ if(dropped && this.options.onDropped) this.options.onDropped(this.element);
398
419
  Draggables.notify('onEnd', this, event);
399
420
 
400
421
  var revert = this.options.revert;
401
- if(revert && typeof revert == 'function') revert = revert(this.element);
422
+ if(revert && Object.isFunction(revert)) revert = revert(this.element);
402
423
 
403
424
  var d = this.currentDelta();
404
425
  if(revert && this.options.reverteffect) {
405
- this.options.reverteffect(this.element,
406
- d[1]-this.delta[1], d[0]-this.delta[0]);
426
+ if (dropped == 0 || revert != 'failure')
427
+ this.options.reverteffect(this.element,
428
+ d[1]-this.delta[1], d[0]-this.delta[0]);
407
429
  } else {
408
430
  this.delta = d;
409
431
  }
@@ -451,15 +473,15 @@ Draggable.prototype = {
451
473
  }.bind(this));
452
474
 
453
475
  if(this.options.snap) {
454
- if(typeof this.options.snap == 'function') {
476
+ if(Object.isFunction(this.options.snap)) {
455
477
  p = this.options.snap(p[0],p[1],this);
456
478
  } else {
457
- if(this.options.snap instanceof Array) {
479
+ if(Object.isArray(this.options.snap)) {
458
480
  p = p.map( function(v, i) {
459
- return Math.round(v/this.options.snap[i])*this.options.snap[i] }.bind(this))
481
+ return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
460
482
  } else {
461
483
  p = p.map( function(v) {
462
- return Math.round(v/this.options.snap)*this.options.snap }.bind(this))
484
+ return (v/this.options.snap).round()*this.options.snap }.bind(this))
463
485
  }
464
486
  }}
465
487
 
@@ -543,12 +565,13 @@ Draggable.prototype = {
543
565
  }
544
566
  return { top: T, left: L, width: W, height: H };
545
567
  }
546
- }
568
+ });
569
+
570
+ Draggable._dragging = { };
547
571
 
548
572
  /*--------------------------------------------------------------------------*/
549
573
 
550
- var SortableObserver = Class.create();
551
- SortableObserver.prototype = {
574
+ var SortableObserver = Class.create({
552
575
  initialize: function(element, observer) {
553
576
  this.element = $(element);
554
577
  this.observer = observer;
@@ -564,15 +587,15 @@ SortableObserver.prototype = {
564
587
  if(this.lastValue != Sortable.serialize(this.element))
565
588
  this.observer(this.element)
566
589
  }
567
- }
590
+ });
568
591
 
569
592
  var Sortable = {
570
593
  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
571
594
 
572
- sortables: {},
595
+ sortables: { },
573
596
 
574
597
  _findRootElement: function(element) {
575
- while (element.tagName != "BODY") {
598
+ while (element.tagName.toUpperCase() != "BODY") {
576
599
  if(element.id && Sortable.sortables[element.id]) return element;
577
600
  element = element.parentNode;
578
601
  }
@@ -612,13 +635,20 @@ var Sortable = {
612
635
  delay: 0,
613
636
  hoverclass: null,
614
637
  ghosting: false,
638
+ quiet: false,
615
639
  scroll: false,
616
640
  scrollSensitivity: 20,
617
641
  scrollSpeed: 15,
618
642
  format: this.SERIALIZE_RULE,
643
+
644
+ // these take arrays of elements or ids and can be
645
+ // used for better initialization performance
646
+ elements: false,
647
+ handles: false,
648
+
619
649
  onChange: Prototype.emptyFunction,
620
650
  onUpdate: Prototype.emptyFunction
621
- }, arguments[1] || {});
651
+ }, arguments[1] || { });
622
652
 
623
653
  // clear any old sortable with same element
624
654
  this.destroy(element);
@@ -626,6 +656,7 @@ var Sortable = {
626
656
  // build options for the draggables
627
657
  var options_for_draggable = {
628
658
  revert: true,
659
+ quiet: options.quiet,
629
660
  scroll: options.scroll,
630
661
  scrollSpeed: options.scrollSpeed,
631
662
  scrollSensitivity: options.scrollSensitivity,
@@ -679,10 +710,9 @@ var Sortable = {
679
710
  options.droppables.push(element);
680
711
  }
681
712
 
682
- (this.findElements(element, options) || []).each( function(e) {
683
- // handles are per-draggable
684
- var handle = options.handle ?
685
- $(e).down('.'+options.handle,0) : e;
713
+ (options.elements || this.findElements(element, options) || []).each( function(e,i) {
714
+ var handle = options.handles ? $(options.handles[i]) :
715
+ (options.handle ? $(e).select('.' + options.handle)[0] : e);
686
716
  options.draggables.push(
687
717
  new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
688
718
  Droppables.add(e, options_for_droppable);
@@ -842,7 +872,7 @@ var Sortable = {
842
872
  only: sortableOptions.only,
843
873
  name: element.id,
844
874
  format: sortableOptions.format
845
- }, arguments[1] || {});
875
+ }, arguments[1] || { });
846
876
 
847
877
  var root = {
848
878
  id: null,
@@ -866,7 +896,7 @@ var Sortable = {
866
896
 
867
897
  sequence: function(element) {
868
898
  element = $(element);
869
- var options = Object.extend(this.options(element), arguments[1] || {});
899
+ var options = Object.extend(this.options(element), arguments[1] || { });
870
900
 
871
901
  return $(this.findElements(element, options) || []).map( function(item) {
872
902
  return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
@@ -875,9 +905,9 @@ var Sortable = {
875
905
 
876
906
  setSequence: function(element, new_sequence) {
877
907
  element = $(element);
878
- var options = Object.extend(this.options(element), arguments[2] || {});
908
+ var options = Object.extend(this.options(element), arguments[2] || { });
879
909
 
880
- var nodeMap = {};
910
+ var nodeMap = { };
881
911
  this.findElements(element, options).each( function(n) {
882
912
  if (n.id.match(options.format))
883
913
  nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
@@ -895,7 +925,7 @@ var Sortable = {
895
925
 
896
926
  serialize: function(element) {
897
927
  element = $(element);
898
- var options = Object.extend(Sortable.options(element), arguments[1] || {});
928
+ var options = Object.extend(Sortable.options(element), arguments[1] || { });
899
929
  var name = encodeURIComponent(
900
930
  (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
901
931
 
@@ -919,7 +949,7 @@ Element.isParent = function(child, element) {
919
949
  return Element.isParent(child.parentNode, element);
920
950
  }
921
951
 
922
- Element.findChildren = function(element, only, recursive, tagName) {
952
+ Element.findChildren = function(element, only, recursive, tagName) {
923
953
  if(!element.hasChildNodes()) return null;
924
954
  tagName = tagName.toUpperCase();
925
955
  if(only) only = [only].flatten();
@@ -1,4 +1,4 @@
1
- // Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
1
+ // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
2
2
  // Contributors:
3
3
  // Justin Palmer (http://encytemedia.com/)
4
4
  // Mark Pilgrim (http://diveintomark.org/)
@@ -11,17 +11,17 @@
11
11
  // returns self (or first argument) if not convertable
12
12
  String.prototype.parseColor = function() {
13
13
  var color = '#';
14
- if(this.slice(0,4) == 'rgb(') {
14
+ if (this.slice(0,4) == 'rgb(') {
15
15
  var cols = this.slice(4,this.length-1).split(',');
16
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();
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
21
  }
22
22
  }
23
- return(color.length==7 ? color : (arguments[0] || this));
24
- }
23
+ return (color.length==7 ? color : (arguments[0] || this));
24
+ };
25
25
 
26
26
  /*--------------------------------------------------------------------------*/
27
27
 
@@ -30,7 +30,7 @@ Element.collectTextNodes = function(element) {
30
30
  return (node.nodeType==3 ? node.nodeValue :
31
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) {
@@ -38,47 +38,18 @@ Element.collectTextNodesIgnoreClass = function(element, className) {
38
38
  ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
39
39
  Element.collectTextNodesIgnoreClass(node, className) : ''));
40
40
  }).flatten().join('');
41
- }
41
+ };
42
42
 
43
43
  Element.setContentZoom = function(element, percent) {
44
44
  element = $(element);
45
45
  element.setStyle({fontSize: (percent/100) + 'em'});
46
- if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
46
+ if (Prototype.Browser.WebKit) window.scrollBy(0,0);
47
47
  return element;
48
- }
49
-
50
- Element.getOpacity = function(element){
51
- element = $(element);
52
- var opacity;
53
- if (opacity = element.getStyle('opacity'))
54
- return parseFloat(opacity);
55
- if (opacity = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
56
- if(opacity[1]) return parseFloat(opacity[1]) / 100;
57
- return 1.0;
58
- }
48
+ };
59
49
 
60
- Element.setOpacity = function(element, value){
61
- element= $(element);
62
- if (value == 1){
63
- element.setStyle({ opacity:
64
- (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ?
65
- 0.999999 : 1.0 });
66
- if(/MSIE/.test(navigator.userAgent) && !window.opera)
67
- element.setStyle({filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'')});
68
- } else {
69
- if(value < 0.00001) value = 0;
70
- element.setStyle({opacity: value});
71
- if(/MSIE/.test(navigator.userAgent) && !window.opera)
72
- element.setStyle(
73
- { filter: element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
74
- 'alpha(opacity='+value*100+')' });
75
- }
76
- return element;
77
- }
78
-
79
- Element.getInlineOpacity = function(element){
50
+ Element.getInlineOpacity = function(element){
80
51
  return $(element).style.opacity || '';
81
- }
52
+ };
82
53
 
83
54
  Element.forceRerendering = function(element) {
84
55
  try {
@@ -91,31 +62,63 @@ Element.forceRerendering = function(element) {
91
62
 
92
63
  /*--------------------------------------------------------------------------*/
93
64
 
94
- Array.prototype.call = function() {
95
- var args = arguments;
96
- this.each(function(f){ f.apply(this, args) });
97
- }
98
-
99
- /*--------------------------------------------------------------------------*/
100
-
101
65
  var Effect = {
102
66
  _elementDoesNotExistError: {
103
67
  name: 'ElementDoesNotExistError',
104
68
  message: 'The specified DOM element does not exist, but is required for this effect to operate'
105
69
  },
70
+ Transitions: {
71
+ linear: Prototype.K,
72
+ sinoidal: function(pos) {
73
+ return (-Math.cos(pos*Math.PI)/2) + 0.5;
74
+ },
75
+ reverse: function(pos) {
76
+ return 1-pos;
77
+ },
78
+ flicker: function(pos) {
79
+ var pos = ((-Math.cos(pos*Math.PI)/4) + 0.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) + 0.5;
84
+ },
85
+ pulse: function(pos, pulses) {
86
+ pulses = pulses || 5;
87
+ return (
88
+ ((pos % (1/pulses)) * pulses).round() == 0 ?
89
+ ((pos * pulses * 2) - (pos * pulses * 2).floor()) :
90
+ 1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
91
+ );
92
+ },
93
+ spring: function(pos) {
94
+ return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
95
+ },
96
+ none: function(pos) {
97
+ return 0;
98
+ },
99
+ full: function(pos) {
100
+ return 1;
101
+ }
102
+ },
103
+ DefaultOptions: {
104
+ duration: 1.0, // seconds
105
+ fps: 100, // 100= assume 66fps max.
106
+ sync: false, // true for combining
107
+ from: 0.0,
108
+ to: 1.0,
109
+ delay: 0.0,
110
+ queue: 'parallel'
111
+ },
106
112
  tagifyText: function(element) {
107
- if(typeof Builder == 'undefined')
108
- throw("Effect.tagifyText requires including script.aculo.us' builder.js library");
109
-
110
113
  var tagifyStyle = 'position:relative';
111
- if(/MSIE/.test(navigator.userAgent) && !window.opera) tagifyStyle += ';zoom:1';
114
+ if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
112
115
 
113
116
  element = $(element);
114
117
  $A(element.childNodes).each( function(child) {
115
- if(child.nodeType==3) {
118
+ if (child.nodeType==3) {
116
119
  child.nodeValue.toArray().each( function(character) {
117
120
  element.insertBefore(
118
- Builder.node('span',{style: tagifyStyle},
121
+ new Element('span', {style: tagifyStyle}).update(
119
122
  character == ' ' ? String.fromCharCode(160) : character),
120
123
  child);
121
124
  });
@@ -125,8 +128,8 @@ var Effect = {
125
128
  },
126
129
  multiple: function(element, effect) {
127
130
  var elements;
128
- if(((typeof element == 'object') ||
129
- (typeof element == 'function')) &&
131
+ if (((typeof element == 'object') ||
132
+ Object.isFunction(element)) &&
130
133
  (element.length))
131
134
  elements = element;
132
135
  else
@@ -135,7 +138,7 @@ var Effect = {
135
138
  var options = Object.extend({
136
139
  speed: 0.1,
137
140
  delay: 0.0
138
- }, arguments[2] || {});
141
+ }, arguments[2] || { });
139
142
  var masterDelay = options.delay;
140
143
 
141
144
  $A(elements).each( function(element, index) {
@@ -152,53 +155,20 @@ var Effect = {
152
155
  effect = (effect || 'appear').toLowerCase();
153
156
  var options = Object.extend({
154
157
  queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
155
- }, arguments[2] || {});
158
+ }, arguments[2] || { });
156
159
  Effect[element.visible() ?
157
160
  Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
158
161
  }
159
162
  };
160
163
 
161
- var Effect2 = Effect; // deprecated
162
-
163
- /* ------------- transitions ------------- */
164
-
165
- Effect.Transitions = {
166
- linear: Prototype.K,
167
- sinoidal: function(pos) {
168
- return (-Math.cos(pos*Math.PI)/2) + 0.5;
169
- },
170
- reverse: function(pos) {
171
- return 1-pos;
172
- },
173
- flicker: function(pos) {
174
- return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
175
- },
176
- wobble: function(pos) {
177
- return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
178
- },
179
- pulse: function(pos, pulses) {
180
- pulses = pulses || 5;
181
- return (
182
- Math.round((pos % (1/pulses)) * pulses) == 0 ?
183
- ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) :
184
- 1 - ((pos * pulses * 2) - Math.floor(pos * pulses * 2))
185
- );
186
- },
187
- none: function(pos) {
188
- return 0;
189
- },
190
- full: function(pos) {
191
- return 1;
192
- }
193
- };
164
+ Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
194
165
 
195
166
  /* ------------- core effects ------------- */
196
167
 
197
- Effect.ScopedQueue = Class.create();
198
- Object.extend(Object.extend(Effect.ScopedQueue.prototype, Enumerable), {
168
+ Effect.ScopedQueue = Class.create(Enumerable, {
199
169
  initialize: function() {
200
170
  this.effects = [];
201
- this.interval = null;
171
+ this.interval = null;
202
172
  },
203
173
  _each: function(iterator) {
204
174
  this.effects._each(iterator);
@@ -206,7 +176,7 @@ Object.extend(Object.extend(Effect.ScopedQueue.prototype, Enumerable), {
206
176
  add: function(effect) {
207
177
  var timestamp = new Date().getTime();
208
178
 
209
- var position = (typeof effect.options.queue == 'string') ?
179
+ var position = Object.isString(effect.options.queue) ?
210
180
  effect.options.queue : effect.options.queue.position;
211
181
 
212
182
  switch(position) {
@@ -229,115 +199,111 @@ Object.extend(Object.extend(Effect.ScopedQueue.prototype, Enumerable), {
229
199
  effect.startOn += timestamp;
230
200
  effect.finishOn += timestamp;
231
201
 
232
- if(!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
202
+ if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
233
203
  this.effects.push(effect);
234
204
 
235
- if(!this.interval)
236
- this.interval = setInterval(this.loop.bind(this), 40);
205
+ if (!this.interval)
206
+ this.interval = setInterval(this.loop.bind(this), 15);
237
207
  },
238
208
  remove: function(effect) {
239
209
  this.effects = this.effects.reject(function(e) { return e==effect });
240
- if(this.effects.length == 0) {
210
+ if (this.effects.length == 0) {
241
211
  clearInterval(this.interval);
242
212
  this.interval = null;
243
213
  }
244
214
  },
245
215
  loop: function() {
246
216
  var timePos = new Date().getTime();
247
- this.effects.invoke('loop', timePos);
217
+ for(var i=0, len=this.effects.length;i<len;i++)
218
+ this.effects[i] && this.effects[i].loop(timePos);
248
219
  }
249
220
  });
250
221
 
251
222
  Effect.Queues = {
252
223
  instances: $H(),
253
224
  get: function(queueName) {
254
- if(typeof queueName != 'string') return queueName;
225
+ if (!Object.isString(queueName)) return queueName;
255
226
 
256
- if(!this.instances[queueName])
257
- this.instances[queueName] = new Effect.ScopedQueue();
258
-
259
- return this.instances[queueName];
227
+ return this.instances.get(queueName) ||
228
+ this.instances.set(queueName, new Effect.ScopedQueue());
260
229
  }
261
- }
230
+ };
262
231
  Effect.Queue = Effect.Queues.get('global');
263
232
 
264
- Effect.DefaultOptions = {
265
- transition: Effect.Transitions.sinoidal,
266
- duration: 1.0, // seconds
267
- fps: 25.0, // max. 25fps due to Effect.Queue implementation
268
- sync: false, // true for combining
269
- from: 0.0,
270
- to: 1.0,
271
- delay: 0.0,
272
- queue: 'parallel'
273
- }
274
-
275
- Effect.Base = function() {};
276
- Effect.Base.prototype = {
233
+ Effect.Base = Class.create({
277
234
  position: null,
278
235
  start: function(options) {
279
- this.options = Object.extend(Object.extend({},Effect.DefaultOptions), options || {});
236
+ function codeForEvent(options,eventName){
237
+ return (
238
+ (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
239
+ (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
240
+ );
241
+ }
242
+ if (options && options.transition === false) options.transition = Effect.Transitions.linear;
243
+ this.options = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
280
244
  this.currentFrame = 0;
281
245
  this.state = 'idle';
282
246
  this.startOn = this.options.delay*1000;
283
- this.finishOn = this.startOn + (this.options.duration*1000);
247
+ this.finishOn = this.startOn+(this.options.duration*1000);
248
+ this.fromToDelta = this.options.to-this.options.from;
249
+ this.totalTime = this.finishOn-this.startOn;
250
+ this.totalFrames = this.options.fps*this.options.duration;
251
+
252
+ eval('this.render = function(pos){ '+
253
+ 'if (this.state=="idle"){this.state="running";'+
254
+ codeForEvent(this.options,'beforeSetup')+
255
+ (this.setup ? 'this.setup();':'')+
256
+ codeForEvent(this.options,'afterSetup')+
257
+ '};if (this.state=="running"){'+
258
+ 'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
259
+ 'this.position=pos;'+
260
+ codeForEvent(this.options,'beforeUpdate')+
261
+ (this.update ? 'this.update(pos);':'')+
262
+ codeForEvent(this.options,'afterUpdate')+
263
+ '}}');
264
+
284
265
  this.event('beforeStart');
285
- if(!this.options.sync)
286
- Effect.Queues.get(typeof this.options.queue == 'string' ?
266
+ if (!this.options.sync)
267
+ Effect.Queues.get(Object.isString(this.options.queue) ?
287
268
  'global' : this.options.queue.scope).add(this);
288
269
  },
289
270
  loop: function(timePos) {
290
- if(timePos >= this.startOn) {
291
- if(timePos >= this.finishOn) {
271
+ if (timePos >= this.startOn) {
272
+ if (timePos >= this.finishOn) {
292
273
  this.render(1.0);
293
274
  this.cancel();
294
275
  this.event('beforeFinish');
295
- if(this.finish) this.finish();
276
+ if (this.finish) this.finish();
296
277
  this.event('afterFinish');
297
278
  return;
298
279
  }
299
- var pos = (timePos - this.startOn) / (this.finishOn - this.startOn);
300
- var frame = Math.round(pos * this.options.fps * this.options.duration);
301
- if(frame > this.currentFrame) {
280
+ var pos = (timePos - this.startOn) / this.totalTime,
281
+ frame = (pos * this.totalFrames).round();
282
+ if (frame > this.currentFrame) {
302
283
  this.render(pos);
303
284
  this.currentFrame = frame;
304
285
  }
305
286
  }
306
287
  },
307
- render: function(pos) {
308
- if(this.state == 'idle') {
309
- this.state = 'running';
310
- this.event('beforeSetup');
311
- if(this.setup) this.setup();
312
- this.event('afterSetup');
313
- }
314
- if(this.state == 'running') {
315
- if(this.options.transition) pos = this.options.transition(pos);
316
- pos *= (this.options.to-this.options.from);
317
- pos += this.options.from;
318
- this.position = pos;
319
- this.event('beforeUpdate');
320
- if(this.update) this.update(pos);
321
- this.event('afterUpdate');
322
- }
323
- },
324
288
  cancel: function() {
325
- if(!this.options.sync)
326
- Effect.Queues.get(typeof this.options.queue == 'string' ?
289
+ if (!this.options.sync)
290
+ Effect.Queues.get(Object.isString(this.options.queue) ?
327
291
  'global' : this.options.queue.scope).remove(this);
328
292
  this.state = 'finished';
329
293
  },
330
294
  event: function(eventName) {
331
- if(this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
332
- if(this.options[eventName]) this.options[eventName](this);
295
+ if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
296
+ if (this.options[eventName]) this.options[eventName](this);
333
297
  },
334
298
  inspect: function() {
335
- return '#<Effect:' + $H(this).inspect() + ',options:' + $H(this.options).inspect() + '>';
299
+ var data = $H();
300
+ for(property in this)
301
+ if (!Object.isFunction(this[property])) data.set(property, this[property]);
302
+ return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
336
303
  }
337
- }
304
+ });
338
305
 
339
- Effect.Parallel = Class.create();
340
- Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), {
306
+ Effect.Parallel = Class.create(Effect.Base, {
341
307
  initialize: function(effects) {
342
308
  this.effects = effects || [];
343
309
  this.start(arguments[1]);
@@ -350,35 +316,45 @@ Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), {
350
316
  effect.render(1.0);
351
317
  effect.cancel();
352
318
  effect.event('beforeFinish');
353
- if(effect.finish) effect.finish(position);
319
+ if (effect.finish) effect.finish(position);
354
320
  effect.event('afterFinish');
355
321
  });
356
322
  }
357
323
  });
358
324
 
359
- Effect.Event = Class.create();
360
- Object.extend(Object.extend(Effect.Event.prototype, Effect.Base.prototype), {
325
+ Effect.Tween = Class.create(Effect.Base, {
326
+ initialize: function(object, from, to) {
327
+ object = Object.isString(object) ? $(object) : object;
328
+ var args = $A(arguments), method = args.last(),
329
+ options = args.length == 5 ? args[3] : null;
330
+ this.method = Object.isFunction(method) ? method.bind(object) :
331
+ Object.isFunction(object[method]) ? object[method].bind(object) :
332
+ function(value) { object[method] = value };
333
+ this.start(Object.extend({ from: from, to: to }, options || { }));
334
+ },
335
+ update: function(position) {
336
+ this.method(position);
337
+ }
338
+ });
339
+
340
+ Effect.Event = Class.create(Effect.Base, {
361
341
  initialize: function() {
362
- var options = Object.extend({
363
- duration: 0
364
- }, arguments[0] || {});
365
- this.start(options);
342
+ this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
366
343
  },
367
344
  update: Prototype.emptyFunction
368
345
  });
369
346
 
370
- Effect.Opacity = Class.create();
371
- Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
347
+ Effect.Opacity = Class.create(Effect.Base, {
372
348
  initialize: function(element) {
373
349
  this.element = $(element);
374
- if(!this.element) throw(Effect._elementDoesNotExistError);
350
+ if (!this.element) throw(Effect._elementDoesNotExistError);
375
351
  // make this work on IE on elements without 'layout'
376
- if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout))
352
+ if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
377
353
  this.element.setStyle({zoom: 1});
378
354
  var options = Object.extend({
379
355
  from: this.element.getOpacity() || 0.0,
380
356
  to: 1.0
381
- }, arguments[1] || {});
357
+ }, arguments[1] || { });
382
358
  this.start(options);
383
359
  },
384
360
  update: function(position) {
@@ -386,36 +362,30 @@ Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
386
362
  }
387
363
  });
388
364
 
389
- Effect.Move = Class.create();
390
- Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), {
365
+ Effect.Move = Class.create(Effect.Base, {
391
366
  initialize: function(element) {
392
367
  this.element = $(element);
393
- if(!this.element) throw(Effect._elementDoesNotExistError);
368
+ if (!this.element) throw(Effect._elementDoesNotExistError);
394
369
  var options = Object.extend({
395
370
  x: 0,
396
371
  y: 0,
397
372
  mode: 'relative'
398
- }, arguments[1] || {});
373
+ }, arguments[1] || { });
399
374
  this.start(options);
400
375
  },
401
376
  setup: function() {
402
- // Bug in Opera: Opera returns the "real" position of a static element or
403
- // relative element that does not have top/left explicitly set.
404
- // ==> Always set top and left for position relative elements in your stylesheets
405
- // (to 0 if you do not need them)
406
377
  this.element.makePositioned();
407
378
  this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
408
379
  this.originalTop = parseFloat(this.element.getStyle('top') || '0');
409
- if(this.options.mode == 'absolute') {
410
- // absolute movement, so we need to calc deltaX and deltaY
380
+ if (this.options.mode == 'absolute') {
411
381
  this.options.x = this.options.x - this.originalLeft;
412
382
  this.options.y = this.options.y - this.originalTop;
413
383
  }
414
384
  },
415
385
  update: function(position) {
416
386
  this.element.setStyle({
417
- left: Math.round(this.options.x * position + this.originalLeft) + 'px',
418
- top: Math.round(this.options.y * position + this.originalTop) + 'px'
387
+ left: (this.options.x * position + this.originalLeft).round() + 'px',
388
+ top: (this.options.y * position + this.originalTop).round() + 'px'
419
389
  });
420
390
  }
421
391
  });
@@ -423,30 +393,29 @@ Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), {
423
393
  // for backwards compatibility
424
394
  Effect.MoveBy = function(element, toTop, toLeft) {
425
395
  return new Effect.Move(element,
426
- Object.extend({ x: toLeft, y: toTop }, arguments[3] || {}));
396
+ Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
427
397
  };
428
398
 
429
- Effect.Scale = Class.create();
430
- Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
399
+ Effect.Scale = Class.create(Effect.Base, {
431
400
  initialize: function(element, percent) {
432
401
  this.element = $(element);
433
- if(!this.element) throw(Effect._elementDoesNotExistError);
402
+ if (!this.element) throw(Effect._elementDoesNotExistError);
434
403
  var options = Object.extend({
435
404
  scaleX: true,
436
405
  scaleY: true,
437
406
  scaleContent: true,
438
407
  scaleFromCenter: false,
439
- scaleMode: 'box', // 'box' or 'contents' or {} with provided values
408
+ scaleMode: 'box', // 'box' or 'contents' or { } with provided values
440
409
  scaleFrom: 100.0,
441
410
  scaleTo: percent
442
- }, arguments[2] || {});
411
+ }, arguments[2] || { });
443
412
  this.start(options);
444
413
  },
445
414
  setup: function() {
446
415
  this.restoreAfterFinish = this.options.restoreAfterFinish || false;
447
416
  this.elementPositioning = this.element.getStyle('position');
448
417
 
449
- this.originalStyle = {};
418
+ this.originalStyle = { };
450
419
  ['top','left','width','height','fontSize'].each( function(k) {
451
420
  this.originalStyle[k] = this.element.style[k];
452
421
  }.bind(this));
@@ -456,7 +425,7 @@ Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
456
425
 
457
426
  var fontSize = this.element.getStyle('font-size') || '100%';
458
427
  ['em','px','%','pt'].each( function(fontSizeType) {
459
- if(fontSize.indexOf(fontSizeType)>0) {
428
+ if (fontSize.indexOf(fontSizeType)>0) {
460
429
  this.fontSize = parseFloat(fontSize);
461
430
  this.fontSizeType = fontSizeType;
462
431
  }
@@ -465,60 +434,61 @@ Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
465
434
  this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
466
435
 
467
436
  this.dims = null;
468
- if(this.options.scaleMode=='box')
437
+ if (this.options.scaleMode=='box')
469
438
  this.dims = [this.element.offsetHeight, this.element.offsetWidth];
470
- if(/^content/.test(this.options.scaleMode))
439
+ if (/^content/.test(this.options.scaleMode))
471
440
  this.dims = [this.element.scrollHeight, this.element.scrollWidth];
472
- if(!this.dims)
441
+ if (!this.dims)
473
442
  this.dims = [this.options.scaleMode.originalHeight,
474
443
  this.options.scaleMode.originalWidth];
475
444
  },
476
445
  update: function(position) {
477
446
  var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
478
- if(this.options.scaleContent && this.fontSize)
447
+ if (this.options.scaleContent && this.fontSize)
479
448
  this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
480
449
  this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
481
450
  },
482
451
  finish: function(position) {
483
- if(this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
452
+ if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
484
453
  },
485
454
  setDimensions: function(height, width) {
486
- var d = {};
487
- if(this.options.scaleX) d.width = Math.round(width) + 'px';
488
- if(this.options.scaleY) d.height = Math.round(height) + 'px';
489
- if(this.options.scaleFromCenter) {
455
+ var d = { };
456
+ if (this.options.scaleX) d.width = width.round() + 'px';
457
+ if (this.options.scaleY) d.height = height.round() + 'px';
458
+ if (this.options.scaleFromCenter) {
490
459
  var topd = (height - this.dims[0])/2;
491
460
  var leftd = (width - this.dims[1])/2;
492
- if(this.elementPositioning == 'absolute') {
493
- if(this.options.scaleY) d.top = this.originalTop-topd + 'px';
494
- if(this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
461
+ if (this.elementPositioning == 'absolute') {
462
+ if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
463
+ if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
495
464
  } else {
496
- if(this.options.scaleY) d.top = -topd + 'px';
497
- if(this.options.scaleX) d.left = -leftd + 'px';
465
+ if (this.options.scaleY) d.top = -topd + 'px';
466
+ if (this.options.scaleX) d.left = -leftd + 'px';
498
467
  }
499
468
  }
500
469
  this.element.setStyle(d);
501
470
  }
502
471
  });
503
472
 
504
- Effect.Highlight = Class.create();
505
- Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), {
473
+ Effect.Highlight = Class.create(Effect.Base, {
506
474
  initialize: function(element) {
507
475
  this.element = $(element);
508
- if(!this.element) throw(Effect._elementDoesNotExistError);
509
- var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
476
+ if (!this.element) throw(Effect._elementDoesNotExistError);
477
+ var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
510
478
  this.start(options);
511
479
  },
512
480
  setup: function() {
513
481
  // Prevent executing on elements not in the layout flow
514
- if(this.element.getStyle('display')=='none') { this.cancel(); return; }
482
+ if (this.element.getStyle('display')=='none') { this.cancel(); return; }
515
483
  // Disable background image during the effect
516
- this.oldStyle = {
517
- backgroundImage: this.element.getStyle('background-image') };
518
- this.element.setStyle({backgroundImage: 'none'});
519
- if(!this.options.endcolor)
484
+ this.oldStyle = { };
485
+ if (!this.options.keepBackgroundImage) {
486
+ this.oldStyle.backgroundImage = this.element.getStyle('background-image');
487
+ this.element.setStyle({backgroundImage: 'none'});
488
+ }
489
+ if (!this.options.endcolor)
520
490
  this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
521
- if(!this.options.restorecolor)
491
+ if (!this.options.restorecolor)
522
492
  this.options.restorecolor = this.element.getStyle('background-color');
523
493
  // init color calculations
524
494
  this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
@@ -526,7 +496,7 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype),
526
496
  },
527
497
  update: function(position) {
528
498
  this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
529
- return m+(Math.round(this._base[i]+(this._delta[i]*position)).toColorPart()); }.bind(this)) });
499
+ return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
530
500
  },
531
501
  finish: function() {
532
502
  this.element.setStyle(Object.extend(this.oldStyle, {
@@ -535,30 +505,21 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype),
535
505
  }
536
506
  });
537
507
 
538
- Effect.ScrollTo = Class.create();
539
- Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {
540
- initialize: function(element) {
541
- this.element = $(element);
542
- this.start(arguments[1] || {});
543
- },
544
- setup: function() {
545
- Position.prepare();
546
- var offsets = Position.cumulativeOffset(this.element);
547
- if(this.options.offset) offsets[1] += this.options.offset;
548
- var max = window.innerHeight ?
549
- window.height - window.innerHeight :
550
- document.body.scrollHeight -
551
- (document.documentElement.clientHeight ?
552
- document.documentElement.clientHeight : document.body.clientHeight);
553
- this.scrollStart = Position.deltaY;
554
- this.delta = (offsets[1] > max ? max : offsets[1]) - this.scrollStart;
555
- },
556
- update: function(position) {
557
- Position.prepare();
558
- window.scrollTo(Position.deltaX,
559
- this.scrollStart + (position*this.delta));
560
- }
561
- });
508
+ Effect.ScrollTo = function(element) {
509
+ var options = arguments[1] || { },
510
+ scrollOffsets = document.viewport.getScrollOffsets(),
511
+ elementOffsets = $(element).cumulativeOffset(),
512
+ max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();
513
+
514
+ if (options.offset) elementOffsets[1] += options.offset;
515
+
516
+ return new Effect.Tween(null,
517
+ scrollOffsets.top,
518
+ elementOffsets[1] > max ? max : elementOffsets[1],
519
+ options,
520
+ function(p){ scrollTo(scrollOffsets.left, p.round()) }
521
+ );
522
+ };
562
523
 
563
524
  /* ------------- combination effects ------------- */
564
525
 
@@ -566,14 +527,15 @@ Effect.Fade = function(element) {
566
527
  element = $(element);
567
528
  var oldOpacity = element.getInlineOpacity();
568
529
  var options = Object.extend({
569
- from: element.getOpacity() || 1.0,
570
- to: 0.0,
571
- afterFinishInternal: function(effect) {
572
- if(effect.options.to!=0) return;
573
- effect.element.hide().setStyle({opacity: oldOpacity});
574
- }}, arguments[1] || {});
530
+ from: element.getOpacity() || 1.0,
531
+ to: 0.0,
532
+ afterFinishInternal: function(effect) {
533
+ if (effect.options.to!=0) return;
534
+ effect.element.hide().setStyle({opacity: oldOpacity});
535
+ }
536
+ }, arguments[1] || { });
575
537
  return new Effect.Opacity(element,options);
576
- }
538
+ };
577
539
 
578
540
  Effect.Appear = function(element) {
579
541
  element = $(element);
@@ -586,9 +548,9 @@ Effect.Appear = function(element) {
586
548
  },
587
549
  beforeSetup: function(effect) {
588
550
  effect.element.setOpacity(effect.options.from).show();
589
- }}, arguments[1] || {});
551
+ }}, arguments[1] || { });
590
552
  return new Effect.Opacity(element,options);
591
- }
553
+ };
592
554
 
593
555
  Effect.Puff = function(element) {
594
556
  element = $(element);
@@ -610,9 +572,9 @@ Effect.Puff = function(element) {
610
572
  },
611
573
  afterFinishInternal: function(effect) {
612
574
  effect.effects[0].element.hide().setStyle(oldStyle); }
613
- }, arguments[1] || {})
575
+ }, arguments[1] || { })
614
576
  );
615
- }
577
+ };
616
578
 
617
579
  Effect.BlindUp = function(element) {
618
580
  element = $(element);
@@ -624,9 +586,9 @@ Effect.BlindUp = function(element) {
624
586
  afterFinishInternal: function(effect) {
625
587
  effect.element.hide().undoClipping();
626
588
  }
627
- }, arguments[1] || {})
589
+ }, arguments[1] || { })
628
590
  );
629
- }
591
+ };
630
592
 
631
593
  Effect.BlindDown = function(element) {
632
594
  element = $(element);
@@ -643,8 +605,8 @@ Effect.BlindDown = function(element) {
643
605
  afterFinishInternal: function(effect) {
644
606
  effect.element.undoClipping();
645
607
  }
646
- }, arguments[1] || {}));
647
- }
608
+ }, arguments[1] || { }));
609
+ };
648
610
 
649
611
  Effect.SwitchOff = function(element) {
650
612
  element = $(element);
@@ -665,8 +627,8 @@ Effect.SwitchOff = function(element) {
665
627
  }
666
628
  })
667
629
  }
668
- }, arguments[1] || {}));
669
- }
630
+ }, arguments[1] || { }));
631
+ };
670
632
 
671
633
  Effect.DropOut = function(element) {
672
634
  element = $(element);
@@ -685,29 +647,35 @@ Effect.DropOut = function(element) {
685
647
  afterFinishInternal: function(effect) {
686
648
  effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
687
649
  }
688
- }, arguments[1] || {}));
689
- }
650
+ }, arguments[1] || { }));
651
+ };
690
652
 
691
653
  Effect.Shake = function(element) {
692
654
  element = $(element);
655
+ var options = Object.extend({
656
+ distance: 20,
657
+ duration: 0.5
658
+ }, arguments[1] || {});
659
+ var distance = parseFloat(options.distance);
660
+ var split = parseFloat(options.duration) / 10.0;
693
661
  var oldStyle = {
694
662
  top: element.getStyle('top'),
695
663
  left: element.getStyle('left') };
696
- return new Effect.Move(element,
697
- { x: 20, y: 0, duration: 0.05, afterFinishInternal: function(effect) {
664
+ return new Effect.Move(element,
665
+ { x: distance, y: 0, duration: split, afterFinishInternal: function(effect) {
698
666
  new Effect.Move(effect.element,
699
- { x: -40, y: 0, duration: 0.1, afterFinishInternal: function(effect) {
667
+ { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
700
668
  new Effect.Move(effect.element,
701
- { x: 40, y: 0, duration: 0.1, afterFinishInternal: function(effect) {
669
+ { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
702
670
  new Effect.Move(effect.element,
703
- { x: -40, y: 0, duration: 0.1, afterFinishInternal: function(effect) {
671
+ { x: -distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
704
672
  new Effect.Move(effect.element,
705
- { x: 40, y: 0, duration: 0.1, afterFinishInternal: function(effect) {
673
+ { x: distance*2, y: 0, duration: split*2, afterFinishInternal: function(effect) {
706
674
  new Effect.Move(effect.element,
707
- { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effect) {
675
+ { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
708
676
  effect.element.undoPositioned().setStyle(oldStyle);
709
677
  }}) }}) }}) }}) }}) }});
710
- }
678
+ };
711
679
 
712
680
  Effect.SlideDown = function(element) {
713
681
  element = $(element).cleanWhitespace();
@@ -723,7 +691,7 @@ Effect.SlideDown = function(element) {
723
691
  afterSetup: function(effect) {
724
692
  effect.element.makePositioned();
725
693
  effect.element.down().makePositioned();
726
- if(window.opera) effect.element.setStyle({top: ''});
694
+ if (window.opera) effect.element.setStyle({top: ''});
727
695
  effect.element.makeClipping().setStyle({height: '0px'}).show();
728
696
  },
729
697
  afterUpdateInternal: function(effect) {
@@ -733,23 +701,25 @@ Effect.SlideDown = function(element) {
733
701
  afterFinishInternal: function(effect) {
734
702
  effect.element.undoClipping().undoPositioned();
735
703
  effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
736
- }, arguments[1] || {})
704
+ }, arguments[1] || { })
737
705
  );
738
- }
706
+ };
739
707
 
740
708
  Effect.SlideUp = function(element) {
741
709
  element = $(element).cleanWhitespace();
742
710
  var oldInnerBottom = element.down().getStyle('bottom');
711
+ var elementDimensions = element.getDimensions();
743
712
  return new Effect.Scale(element, window.opera ? 0 : 1,
744
713
  Object.extend({ scaleContent: false,
745
714
  scaleX: false,
746
715
  scaleMode: 'box',
747
716
  scaleFrom: 100,
717
+ scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
748
718
  restoreAfterFinish: true,
749
- beforeStartInternal: function(effect) {
719
+ afterSetup: function(effect) {
750
720
  effect.element.makePositioned();
751
721
  effect.element.down().makePositioned();
752
- if(window.opera) effect.element.setStyle({top: ''});
722
+ if (window.opera) effect.element.setStyle({top: ''});
753
723
  effect.element.makeClipping().show();
754
724
  },
755
725
  afterUpdateInternal: function(effect) {
@@ -757,12 +727,12 @@ Effect.SlideUp = function(element) {
757
727
  (effect.dims[0] - effect.element.clientHeight) + 'px' });
758
728
  },
759
729
  afterFinishInternal: function(effect) {
760
- effect.element.hide().undoClipping().undoPositioned().setStyle({bottom: oldInnerBottom});
761
- effect.element.down().undoPositioned();
730
+ effect.element.hide().undoClipping().undoPositioned();
731
+ effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
762
732
  }
763
- }, arguments[1] || {})
733
+ }, arguments[1] || { })
764
734
  );
765
- }
735
+ };
766
736
 
767
737
  // Bug in opera makes the TD containing this element expand for a instance after finish
768
738
  Effect.Squish = function(element) {
@@ -775,7 +745,7 @@ Effect.Squish = function(element) {
775
745
  effect.element.hide().undoClipping();
776
746
  }
777
747
  });
778
- }
748
+ };
779
749
 
780
750
  Effect.Grow = function(element) {
781
751
  element = $(element);
@@ -784,7 +754,7 @@ Effect.Grow = function(element) {
784
754
  moveTransition: Effect.Transitions.sinoidal,
785
755
  scaleTransition: Effect.Transitions.sinoidal,
786
756
  opacityTransition: Effect.Transitions.full
787
- }, arguments[1] || {});
757
+ }, arguments[1] || { });
788
758
  var oldStyle = {
789
759
  top: element.style.top,
790
760
  left: element.style.left,
@@ -849,7 +819,7 @@ Effect.Grow = function(element) {
849
819
  )
850
820
  }
851
821
  });
852
- }
822
+ };
853
823
 
854
824
  Effect.Shrink = function(element) {
855
825
  element = $(element);
@@ -858,7 +828,7 @@ Effect.Shrink = function(element) {
858
828
  moveTransition: Effect.Transitions.sinoidal,
859
829
  scaleTransition: Effect.Transitions.sinoidal,
860
830
  opacityTransition: Effect.Transitions.none
861
- }, arguments[1] || {});
831
+ }, arguments[1] || { });
862
832
  var oldStyle = {
863
833
  top: element.style.top,
864
834
  left: element.style.left,
@@ -903,11 +873,11 @@ Effect.Shrink = function(element) {
903
873
  effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
904
874
  }, options)
905
875
  );
906
- }
876
+ };
907
877
 
908
878
  Effect.Pulsate = function(element) {
909
879
  element = $(element);
910
- var options = arguments[1] || {};
880
+ var options = arguments[1] || { };
911
881
  var oldOpacity = element.getInlineOpacity();
912
882
  var transition = options.transition || Effect.Transitions.sinoidal;
913
883
  var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
@@ -916,7 +886,7 @@ Effect.Pulsate = function(element) {
916
886
  Object.extend(Object.extend({ duration: 2.0, from: 0,
917
887
  afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
918
888
  }, options), {transition: reverser}));
919
- }
889
+ };
920
890
 
921
891
  Effect.Fold = function(element) {
922
892
  element = $(element);
@@ -936,37 +906,71 @@ Effect.Fold = function(element) {
936
906
  afterFinishInternal: function(effect) {
937
907
  effect.element.hide().undoClipping().setStyle(oldStyle);
938
908
  } });
939
- }}, arguments[1] || {}));
909
+ }}, arguments[1] || { }));
940
910
  };
941
911
 
942
- Effect.Morph = Class.create();
943
- Object.extend(Object.extend(Effect.Morph.prototype, Effect.Base.prototype), {
912
+ Effect.Morph = Class.create(Effect.Base, {
944
913
  initialize: function(element) {
945
914
  this.element = $(element);
946
- if(!this.element) throw(Effect._elementDoesNotExistError);
915
+ if (!this.element) throw(Effect._elementDoesNotExistError);
947
916
  var options = Object.extend({
948
- style: ''
949
- }, arguments[1] || {});
917
+ style: { }
918
+ }, arguments[1] || { });
919
+
920
+ if (!Object.isString(options.style)) this.style = $H(options.style);
921
+ else {
922
+ if (options.style.include(':'))
923
+ this.style = options.style.parseStyle();
924
+ else {
925
+ this.element.addClassName(options.style);
926
+ this.style = $H(this.element.getStyles());
927
+ this.element.removeClassName(options.style);
928
+ var css = this.element.getStyles();
929
+ this.style = this.style.reject(function(style) {
930
+ return style.value == css[style.key];
931
+ });
932
+ options.afterFinishInternal = function(effect) {
933
+ effect.element.addClassName(effect.options.style);
934
+ effect.transforms.each(function(transform) {
935
+ effect.element.style[transform.style] = '';
936
+ });
937
+ }
938
+ }
939
+ }
950
940
  this.start(options);
951
941
  },
942
+
952
943
  setup: function(){
953
944
  function parseColor(color){
954
- if(!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
945
+ if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
955
946
  color = color.parseColor();
956
947
  return $R(0,2).map(function(i){
957
948
  return parseInt( color.slice(i*2+1,i*2+3), 16 )
958
949
  });
959
950
  }
960
- this.transforms = this.options.style.parseStyle().map(function(property){
961
- var originalValue = this.element.getStyle(property[0]);
962
- return $H({
963
- style: property[0],
964
- originalValue: property[1].unit=='color' ?
965
- parseColor(originalValue) : parseFloat(originalValue || 0),
966
- targetValue: property[1].unit=='color' ?
967
- parseColor(property[1].value) : property[1].value,
968
- unit: property[1].unit
969
- });
951
+ this.transforms = this.style.map(function(pair){
952
+ var property = pair[0], value = pair[1], unit = null;
953
+
954
+ if (value.parseColor('#zzzzzz') != '#zzzzzz') {
955
+ value = value.parseColor();
956
+ unit = 'color';
957
+ } else if (property == 'opacity') {
958
+ value = parseFloat(value);
959
+ if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
960
+ this.element.setStyle({zoom: 1});
961
+ } else if (Element.CSS_LENGTH.test(value)) {
962
+ var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
963
+ value = parseFloat(components[1]);
964
+ unit = (components.length == 3) ? components[2] : null;
965
+ }
966
+
967
+ var originalValue = this.element.getStyle(property);
968
+ return {
969
+ style: property.camelize(),
970
+ originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
971
+ targetValue: unit=='color' ? parseColor(value) : value,
972
+ unit: unit
973
+ };
970
974
  }.bind(this)).reject(function(transform){
971
975
  return (
972
976
  (transform.originalValue == transform.targetValue) ||
@@ -978,32 +982,35 @@ Object.extend(Object.extend(Effect.Morph.prototype, Effect.Base.prototype), {
978
982
  });
979
983
  },
980
984
  update: function(position) {
981
- var style = $H(), value = null;
982
- this.transforms.each(function(transform){
983
- value = transform.unit=='color' ?
984
- $R(0,2).inject('#',function(m,v,i){
985
- return m+(Math.round(transform.originalValue[i]+
986
- (transform.targetValue[i] - transform.originalValue[i])*position)).toColorPart() }) :
987
- transform.originalValue + Math.round(
988
- ((transform.targetValue - transform.originalValue) * position) * 1000)/1000 + transform.unit;
989
- style[transform.style] = value;
990
- });
991
- this.element.setStyle(style);
985
+ var style = { }, transform, i = this.transforms.length;
986
+ while(i--)
987
+ style[(transform = this.transforms[i]).style] =
988
+ transform.unit=='color' ? '#'+
989
+ (Math.round(transform.originalValue[0]+
990
+ (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
991
+ (Math.round(transform.originalValue[1]+
992
+ (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
993
+ (Math.round(transform.originalValue[2]+
994
+ (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
995
+ (transform.originalValue +
996
+ (transform.targetValue - transform.originalValue) * position).toFixed(3) +
997
+ (transform.unit === null ? '' : transform.unit);
998
+ this.element.setStyle(style, true);
992
999
  }
993
1000
  });
994
1001
 
995
- Effect.Transform = Class.create();
996
- Object.extend(Effect.Transform.prototype, {
1002
+ Effect.Transform = Class.create({
997
1003
  initialize: function(tracks){
998
1004
  this.tracks = [];
999
- this.options = arguments[1] || {};
1005
+ this.options = arguments[1] || { };
1000
1006
  this.addTracks(tracks);
1001
1007
  },
1002
1008
  addTracks: function(tracks){
1003
1009
  tracks.each(function(track){
1004
- var data = $H(track).values().first();
1010
+ track = $H(track);
1011
+ var data = track.values().first();
1005
1012
  this.tracks.push($H({
1006
- ids: $H(track).keys().first(),
1013
+ ids: track.keys().first(),
1007
1014
  effect: Effect.Morph,
1008
1015
  options: { style: data }
1009
1016
  }));
@@ -1013,76 +1020,101 @@ Object.extend(Effect.Transform.prototype, {
1013
1020
  play: function(){
1014
1021
  return new Effect.Parallel(
1015
1022
  this.tracks.map(function(track){
1016
- var elements = [$(track.ids) || $$(track.ids)].flatten();
1017
- return elements.map(function(e){ return new track.effect(e, Object.extend({ sync:true }, track.options)) });
1023
+ var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
1024
+ var elements = [$(ids) || $$(ids)].flatten();
1025
+ return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
1018
1026
  }).flatten(),
1019
1027
  this.options
1020
1028
  );
1021
1029
  }
1022
1030
  });
1023
1031
 
1024
- Element.CSS_PROPERTIES = ['azimuth', 'backgroundAttachment', 'backgroundColor', 'backgroundImage',
1025
- 'backgroundPosition', 'backgroundRepeat', 'borderBottomColor', 'borderBottomStyle',
1026
- 'borderBottomWidth', 'borderCollapse', 'borderLeftColor', 'borderLeftStyle', 'borderLeftWidth',
1027
- 'borderRightColor', 'borderRightStyle', 'borderRightWidth', 'borderSpacing', 'borderTopColor',
1028
- 'borderTopStyle', 'borderTopWidth', 'bottom', 'captionSide', 'clear', 'clip', 'color', 'content',
1029
- 'counterIncrement', 'counterReset', 'cssFloat', 'cueAfter', 'cueBefore', 'cursor', 'direction',
1030
- 'display', 'elevation', 'emptyCells', 'fontFamily', 'fontSize', 'fontSizeAdjust', 'fontStretch',
1031
- 'fontStyle', 'fontVariant', 'fontWeight', 'height', 'left', 'letterSpacing', 'lineHeight',
1032
- 'listStyleImage', 'listStylePosition', 'listStyleType', 'marginBottom', 'marginLeft', 'marginRight',
1033
- 'marginTop', 'markerOffset', 'marks', 'maxHeight', 'maxWidth', 'minHeight', 'minWidth', 'opacity',
1034
- 'orphans', 'outlineColor', 'outlineOffset', 'outlineStyle', 'outlineWidth', 'overflowX', 'overflowY',
1035
- 'paddingBottom', 'paddingLeft', 'paddingRight', 'paddingTop', 'page', 'pageBreakAfter', 'pageBreakBefore',
1036
- 'pageBreakInside', 'pauseAfter', 'pauseBefore', 'pitch', 'pitchRange', 'position', 'quotes',
1037
- 'richness', 'right', 'size', 'speakHeader', 'speakNumeral', 'speakPunctuation', 'speechRate', 'stress',
1038
- 'tableLayout', 'textAlign', 'textDecoration', 'textIndent', 'textShadow', 'textTransform', 'top',
1039
- 'unicodeBidi', 'verticalAlign', 'visibility', 'voiceFamily', 'volume', 'whiteSpace', 'widows',
1040
- 'width', 'wordSpacing', 'zIndex'];
1032
+ Element.CSS_PROPERTIES = $w(
1033
+ 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
1034
+ 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
1035
+ 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
1036
+ 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
1037
+ 'fontSize fontWeight height left letterSpacing lineHeight ' +
1038
+ 'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
1039
+ 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
1040
+ 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
1041
+ 'right textIndent top width wordSpacing zIndex');
1041
1042
 
1042
1043
  Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
1043
1044
 
1045
+ String.__parseStyleElement = document.createElement('div');
1044
1046
  String.prototype.parseStyle = function(){
1045
- var element = Element.extend(document.createElement('div'));
1046
- element.innerHTML = '<div style="' + this + '"></div>';
1047
- var style = element.down().style, styleRules = $H();
1047
+ var style, styleRules = $H();
1048
+ if (Prototype.Browser.WebKit)
1049
+ style = new Element('div',{style:this}).style;
1050
+ else {
1051
+ String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
1052
+ style = String.__parseStyleElement.childNodes[0].style;
1053
+ }
1048
1054
 
1049
1055
  Element.CSS_PROPERTIES.each(function(property){
1050
- if(style[property]) styleRules[property] = style[property];
1056
+ if (style[property]) styleRules.set(property, style[property]);
1051
1057
  });
1052
1058
 
1053
- var result = $H();
1054
-
1055
- styleRules.each(function(pair){
1056
- var property = pair[0], value = pair[1], unit = null;
1057
-
1058
- if(value.parseColor('#zzzzzz') != '#zzzzzz') {
1059
- value = value.parseColor();
1060
- unit = 'color';
1061
- } else if(Element.CSS_LENGTH.test(value))
1062
- var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/),
1063
- value = parseFloat(components[1]), unit = (components.length == 3) ? components[2] : null;
1064
-
1065
- result[property.underscore().dasherize()] = $H({ value:value, unit:unit });
1066
- }.bind(this));
1067
-
1068
- return result;
1059
+ if (Prototype.Browser.IE && this.include('opacity'))
1060
+ styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
1061
+
1062
+ return styleRules;
1069
1063
  };
1070
1064
 
1071
- Element.morph = function(element, style) {
1072
- new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || {}));
1073
- return element;
1065
+ if (document.defaultView && document.defaultView.getComputedStyle) {
1066
+ Element.getStyles = function(element) {
1067
+ var css = document.defaultView.getComputedStyle($(element), null);
1068
+ return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
1069
+ styles[property] = css[property];
1070
+ return styles;
1071
+ });
1072
+ };
1073
+ } else {
1074
+ Element.getStyles = function(element) {
1075
+ element = $(element);
1076
+ var css = element.currentStyle, styles;
1077
+ styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
1078
+ hash.set(property, css[property]);
1079
+ return hash;
1080
+ });
1081
+ if (!styles.opacity) styles.set('opacity', element.getOpacity());
1082
+ return styles;
1083
+ };
1074
1084
  };
1075
1085
 
1076
- ['setOpacity','getOpacity','getInlineOpacity','forceRerendering','setContentZoom',
1077
- 'collectTextNodes','collectTextNodesIgnoreClass','morph'].each(
1078
- function(f) { Element.Methods[f] = Element[f]; }
1086
+ Effect.Methods = {
1087
+ morph: function(element, style) {
1088
+ element = $(element);
1089
+ new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
1090
+ return element;
1091
+ },
1092
+ visualEffect: function(element, effect, options) {
1093
+ element = $(element)
1094
+ var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
1095
+ new Effect[klass](element, options);
1096
+ return element;
1097
+ },
1098
+ highlight: function(element, options) {
1099
+ element = $(element);
1100
+ new Effect.Highlight(element, options);
1101
+ return element;
1102
+ }
1103
+ };
1104
+
1105
+ $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
1106
+ 'pulsate shake puff squish switchOff dropOut').each(
1107
+ function(effect) {
1108
+ Effect.Methods[effect] = function(element, options){
1109
+ element = $(element);
1110
+ Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
1111
+ return element;
1112
+ }
1113
+ }
1079
1114
  );
1080
1115
 
1081
- Element.Methods.visualEffect = function(element, effect, options) {
1082
- s = effect.gsub(/_/, '-').camelize();
1083
- effect_class = s.charAt(0).toUpperCase() + s.substring(1);
1084
- new Effect[effect_class](element, options);
1085
- return $(element);
1086
- };
1116
+ $w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
1117
+ function(f) { Effect.Methods[f] = Element[f]; }
1118
+ );
1087
1119
 
1088
- Element.addMethods();
1120
+ Element.addMethods(Effect.Methods);