skylinecms 3.1.0 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (540) hide show
  1. data/.gitignore +5 -0
  2. data/CHANGELOG +51 -1
  3. data/Gemfile +8 -0
  4. data/Rakefile +0 -43
  5. data/app/controllers/skyline/application_controller.rb +30 -26
  6. data/app/controllers/skyline/articles_controller.rb +8 -28
  7. data/app/controllers/skyline/authentications_controller.rb +6 -8
  8. data/app/controllers/skyline/browser/links_controller.rb +12 -8
  9. data/app/controllers/skyline/browser/tabs/linkables_controller.rb +9 -0
  10. data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb +0 -12
  11. data/app/controllers/skyline/content/editors/editable_list_controller.rb +0 -4
  12. data/app/controllers/skyline/content/editors/joinable_list_controller.rb +1 -19
  13. data/app/controllers/skyline/content_controller.rb +14 -30
  14. data/app/controllers/skyline/content_items_controller.rb +3 -9
  15. data/app/controllers/skyline/content_sections_controller.rb +3 -10
  16. data/app/controllers/skyline/link_section_links_controller.rb +2 -10
  17. data/app/controllers/skyline/media/data_controller.rb +24 -14
  18. data/app/controllers/skyline/media/dirs_controller.rb +12 -26
  19. data/app/controllers/skyline/media/files_controller.rb +12 -28
  20. data/app/controllers/skyline/publications_controller.rb +0 -12
  21. data/app/controllers/skyline/published_publications_controller.rb +0 -4
  22. data/app/controllers/skyline/sections_controller.rb +4 -18
  23. data/app/controllers/skyline/site/media_files_data_controller.rb +11 -13
  24. data/app/controllers/skyline/site/pages_controller.rb +4 -3
  25. data/app/controllers/skyline/skyline2_controller.rb +1 -1
  26. data/app/controllers/skyline/users_controller.rb +7 -31
  27. data/app/controllers/skyline/variant_current_editor_controller.rb +5 -5
  28. data/app/controllers/skyline/variants_controller.rb +3 -3
  29. data/app/helpers/skyline/application_helper.rb +16 -5
  30. data/app/helpers/skyline/button_helper.rb +12 -18
  31. data/app/helpers/skyline/content_helper.rb +11 -11
  32. data/app/helpers/skyline/dialog_helper.rb +3 -2
  33. data/app/helpers/skyline/editors/checkable_list.rb +4 -2
  34. data/app/helpers/skyline/editors/date_time.rb +1 -1
  35. data/app/helpers/skyline/editors/display.rb +1 -1
  36. data/app/helpers/skyline/editors/editable_list.rb +13 -8
  37. data/app/helpers/skyline/editors/editor.rb +10 -10
  38. data/app/helpers/skyline/editors/list.rb +2 -2
  39. data/app/helpers/skyline/editors/page_browser.rb +1 -0
  40. data/app/helpers/skyline/editors/wysiwyg.rb +2 -3
  41. data/app/helpers/skyline/form_helper.rb +36 -0
  42. data/app/helpers/skyline/media/files_helper.rb +1 -1
  43. data/app/helpers/skyline/message_generator.rb +13 -4
  44. data/app/helpers/skyline/pages_helper.rb +1 -1
  45. data/app/helpers/skyline/plugin_helper.rb +1 -1
  46. data/app/helpers/skyline/presenters/presenter.rb +12 -8
  47. data/app/helpers/skyline/ref_object_helper.rb +9 -7
  48. data/app/helpers/skyline/translation_helper.rb +1 -1
  49. data/app/helpers/skyline/tree_helper.rb +1 -3
  50. data/app/middleware/skyline/flash_session_cookie_middleware.rb +6 -1
  51. data/app/middleware/skyline/plugins_loader_middleware.rb +1 -1
  52. data/app/middleware/skyline/sprockets_middleware.rb +1 -1
  53. data/app/models/skyline/article.rb +94 -26
  54. data/app/models/skyline/article_version.rb +22 -9
  55. data/app/models/skyline/image_ref.rb +1 -1
  56. data/app/models/skyline/inline_ref.rb +78 -62
  57. data/app/models/skyline/link_ref.rb +1 -1
  58. data/app/models/skyline/media_cache.rb +4 -2
  59. data/app/models/skyline/media_file.rb +2 -5
  60. data/app/models/skyline/media_node.rb +2 -2
  61. data/app/models/skyline/object_ref.rb +2 -2
  62. data/app/models/skyline/page.rb +8 -6
  63. data/app/models/skyline/page_fragment.rb +4 -2
  64. data/app/models/skyline/publication.rb +1 -1
  65. data/app/models/skyline/sections/content_collection_section.rb +1 -1
  66. data/app/models/skyline/sections/link_section.rb +1 -1
  67. data/app/models/skyline/user.rb +17 -7
  68. data/app/models/skyline/user_preference.rb +1 -1
  69. data/app/models/skyline/variant.rb +11 -5
  70. data/app/templates/skyline/page/default/index.html.erb +1 -1
  71. data/app/templates/skyline/sections/raw_section/default/index.html.erb +1 -1
  72. data/app/templates/skyline/sections/wysiwyg_section/default/index.html.erb +1 -1
  73. data/app/views/skyline/articles/_currently_editing.html.erb +1 -1
  74. data/app/views/skyline/articles/_meta.html.erb +24 -11
  75. data/app/views/skyline/articles/_security.html.erb +2 -2
  76. data/app/views/skyline/articles/_takeover_action.html.erb +1 -1
  77. data/app/views/skyline/articles/edit.html.erb +29 -16
  78. data/app/views/skyline/articles/edit_preview_only.html.erb +2 -2
  79. data/app/views/skyline/articles/index.html.erb +2 -2
  80. data/app/views/skyline/articles/page/_header.html.erb +1 -1
  81. data/app/views/skyline/articles/page/_index.html.erb +9 -3
  82. data/app/views/skyline/articles/page_fragment/_index.html.erb +7 -2
  83. data/app/views/skyline/articles/update.js.erb +20 -0
  84. data/app/views/skyline/authentications/new.html.erb +1 -1
  85. data/app/views/skyline/browser/links/_index.html.erb +2 -0
  86. data/app/views/skyline/browser/tabs/linkables/_index.html.erb +29 -0
  87. data/app/views/skyline/browser/tabs/linkables/_show.html.erb +67 -0
  88. data/app/views/skyline/browser/tabs/linkables/show.js.erb +4 -0
  89. data/app/views/skyline/browser/tabs/media_library/_index.html.erb +2 -2
  90. data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb +4 -35
  91. data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb +1 -3
  92. data/app/views/skyline/browser/tabs/media_library/media_files/index.js.erb +1 -0
  93. data/app/views/skyline/browser/tabs/media_library/media_files/show.js.erb +1 -0
  94. data/app/views/skyline/browser/tabs/pages/_index.html.erb +1 -1
  95. data/app/views/skyline/content/_add.rhtml +6 -1
  96. data/app/views/skyline/content/_filter.rhtml +1 -1
  97. data/app/views/skyline/content/_import.html.erb +1 -1
  98. data/app/views/skyline/content/_index.html.erb +2 -2
  99. data/app/views/skyline/content/_meta.html.erb +2 -2
  100. data/app/views/skyline/content/create.rhtml +1 -1
  101. data/app/views/skyline/content/edit.rhtml +1 -1
  102. data/app/views/skyline/content/editors/editable_list/new.js.erb +2 -0
  103. data/app/views/skyline/content/editors/joinable_list/_add.html.erb +17 -10
  104. data/app/views/skyline/content/editors/joinable_list/_list.html.erb +24 -8
  105. data/app/views/skyline/content/editors/joinable_list/cancel.js.erb +1 -0
  106. data/app/views/skyline/content/editors/joinable_list/index.js.erb +1 -0
  107. data/app/views/skyline/content/editors/joinable_list/new.js.erb +5 -0
  108. data/app/views/skyline/content/field.js.erb +2 -0
  109. data/app/views/skyline/content/import.js.erb +4 -0
  110. data/app/views/skyline/content/order.js.erb +6 -0
  111. data/app/views/skyline/content/presenters/_table.html.erb +1 -1
  112. data/app/views/skyline/content_items/_content_item.html.erb +2 -2
  113. data/app/views/skyline/content_items/new.js.erb +6 -0
  114. data/app/views/skyline/content_sections/_tags.html.erb +2 -2
  115. data/app/views/skyline/content_sections/new.js.erb +6 -0
  116. data/app/views/skyline/link_section_links/_form.html.erb +1 -1
  117. data/app/views/skyline/link_section_links/new.js.erb +4 -0
  118. data/app/views/skyline/locales/show.js.erb +3 -3
  119. data/app/views/skyline/media/dirs/_edit.html.erb +9 -7
  120. data/app/views/skyline/media/dirs/edit.js.erb +1 -0
  121. data/app/views/skyline/media/dirs/index.html.erb +16 -6
  122. data/app/views/skyline/media/dirs/index.js.erb +6 -0
  123. data/app/views/skyline/media/dirs/show.js.erb +5 -0
  124. data/app/views/skyline/media/files/_edit.html.erb +13 -11
  125. data/app/views/skyline/media/files/_index.html.erb +2 -2
  126. data/app/views/skyline/media/files/_new.html.erb +2 -2
  127. data/app/views/skyline/media/files/edit.js.erb +4 -0
  128. data/app/views/skyline/media/files/index.js.erb +4 -0
  129. data/app/views/skyline/media/files/update.js.erb +8 -0
  130. data/app/views/skyline/publications/_index.html.erb +2 -2
  131. data/app/views/skyline/publications/index.js.erb +9 -0
  132. data/app/views/skyline/sections/_content_collection_section.html.erb +6 -6
  133. data/app/views/skyline/sections/_content_item_section.html.erb +1 -1
  134. data/app/views/skyline/sections/_form.html.erb +4 -4
  135. data/app/views/skyline/sections/_link_section.html.erb +6 -1
  136. data/app/views/skyline/sections/_splitter_section.html.erb +1 -1
  137. data/app/views/skyline/sections/_wysiwyg_section.html.erb +2 -2
  138. data/app/views/skyline/sections/new.js.erb +12 -0
  139. data/app/views/skyline/settings/edit.html.erb +1 -1
  140. data/app/views/skyline/shared/_head.html.erb +3 -0
  141. data/app/views/skyline/shared/_header_area.html.erb +5 -5
  142. data/app/views/skyline/users/_edit.html.erb +1 -1
  143. data/app/views/skyline/users/_form.html.erb +1 -1
  144. data/app/views/skyline/users/_new.html.erb +1 -1
  145. data/app/views/skyline/users/create.js.erb +2 -0
  146. data/app/views/skyline/users/edit.js.erb +1 -0
  147. data/app/views/skyline/users/index.html.erb +21 -6
  148. data/app/views/skyline/users/new.js.erb +1 -0
  149. data/app/views/skyline/users/update.js.erb +2 -0
  150. data/config/initializers/dependencies.rb +1 -17
  151. data/config/initializers/gem_dependencies.rb +10 -0
  152. data/config/initializers/locales.rb +8 -1
  153. data/config/initializers/middlewares.rb +7 -3
  154. data/config/initializers/observers.rb +6 -4
  155. data/config/locales/en-US.yml +44 -34
  156. data/config/locales/nl-NL.yml +45 -33
  157. data/config/routes.rb +65 -74
  158. data/db/migrate/20090508145820_create_skyline_pages.rb +2 -2
  159. data/db/migrate/20090508145852_create_skyline_page_versions.rb +2 -2
  160. data/db/migrate/20090508150149_create_skyline_sections.rb +1 -1
  161. data/db/migrate/20090610142139_add_skyline_tags_taggable_type.rb +2 -2
  162. data/db/migrate/20090624154251_create_skyline_link_section_links.rb +1 -1
  163. data/db/migrate/20100120113953_remove_unused_articles_index.rb +1 -1
  164. data/db/migrate/20110816080626_add_skyline_test_article_data.rb +13 -0
  165. data/db/migrate/20111101092405_rename_indexes.rb +24 -0
  166. data/doc/INSTALL.md +54 -27
  167. data/doc/MIGRATION.md +27 -2
  168. data/lib/skyline.rb +2 -1
  169. data/lib/skyline/authentication/user.rb +80 -0
  170. data/lib/skyline/belongs_to_referable.rb +1 -1
  171. data/lib/skyline/cli/init.rb +14 -26
  172. data/lib/skyline/cli/init/templates/config/initializers/skyline_configuration.rb +0 -1
  173. data/lib/skyline/configuration.rb +74 -32
  174. data/lib/skyline/content/content.rb +7 -6
  175. data/lib/skyline/content/field_meta_data.rb +2 -2
  176. data/lib/skyline/content/stack.rb +1 -1
  177. data/lib/skyline/content_item_section_selectable.rb +4 -4
  178. data/lib/skyline/deprecated/version3_0_8.rb +2 -2
  179. data/lib/skyline/engine.rb +37 -0
  180. data/lib/skyline/form_builder.rb +8 -8
  181. data/lib/skyline/linkable.rb +28 -0
  182. data/lib/skyline/plugins/manager.rb +77 -0
  183. data/lib/skyline/plugins/plugin.rb +89 -0
  184. data/lib/skyline/rendering/helpers/renderer_helper.rb +1 -1
  185. data/lib/skyline/rendering/renderer.rb +27 -13
  186. data/lib/skyline/route_constraint.rb +15 -0
  187. data/lib/skyline/settings.rb +9 -7
  188. data/lib/skyline/taggable.rb +2 -2
  189. data/lib/skyline/version.rb +4 -4
  190. data/lib/skylinecms.rb +5 -3
  191. data/lib/tasks/database.rake +2 -2
  192. data/public/skyline/javascripts/src/application.js +5 -4
  193. data/public/skyline/javascripts/src/rails.js +165 -0
  194. data/public/skyline/javascripts/src/sections.js +6 -9
  195. data/public/skyline/javascripts/src/skyline.editor/src/plugins/autoresize/editor_plugin.js +72 -27
  196. data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylineimage/dialog.js +13 -12
  197. data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylinelink/dialog.js +7 -7
  198. data/public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js +4 -3
  199. data/public/skyline/javascripts/src/skyline.editor/src/theme.js +101 -536
  200. data/public/skyline/javascripts/src/skyline.editor/test/multiple_editors.html +1 -0
  201. data/public/skyline/javascripts/src/skyline.editor/test/single.html +56 -0
  202. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/changelog.txt +1410 -1091
  203. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/accessibility.html +101 -0
  204. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/custom_formats.html +1 -1
  205. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full.html +12 -12
  206. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/lists/media_list.js +5 -1
  207. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/media/sample.flv +0 -0
  208. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/menu.html +2 -1
  209. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/skins.html +4 -4
  210. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/word.html +3 -2
  211. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/langs/en.js +1 -170
  212. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js +1 -5
  213. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +30 -29
  214. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js +1 -1
  215. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js +1 -1
  216. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm +34 -31
  217. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +32 -13
  218. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js +1 -43
  219. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js +21 -17
  220. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js +1 -52
  221. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm +35 -30
  222. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js +1 -1
  223. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js +31 -9
  224. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js +1 -0
  225. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js +172 -0
  226. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js +1 -1
  227. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js +23 -5
  228. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js +1 -1
  229. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js +14 -5
  230. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js +1 -1
  231. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +1 -1
  232. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js +1 -1
  233. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +34 -21
  234. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm +15 -14
  235. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif +0 -0
  236. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif +0 -0
  237. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif +0 -0
  238. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif +0 -0
  239. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif +0 -0
  240. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif +0 -0
  241. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js +1 -20
  242. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js +1 -0
  243. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js +50 -0
  244. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css +3 -42
  245. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js +1 -1
  246. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js +315 -63
  247. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm +18 -330
  248. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +199 -438
  249. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js +1 -85
  250. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
  251. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js +12 -4
  252. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm +2 -1
  253. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js +1 -1
  254. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +80 -16
  255. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif +0 -0
  256. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif +0 -0
  257. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif +0 -0
  258. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif +0 -0
  259. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif +0 -0
  260. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css +1 -1
  261. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js +1 -1
  262. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js +2 -0
  263. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js +1 -1
  264. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +31 -28
  265. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js +1 -0
  266. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js +781 -0
  267. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css +5 -4
  268. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js +1 -1
  269. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js +703 -295
  270. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js +361 -602
  271. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js +1 -103
  272. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm +365 -285
  273. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf +0 -0
  274. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +1 -1
  275. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +4 -3
  276. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js +1 -1
  277. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js +7 -2
  278. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js +1 -1
  279. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js +1 -4
  280. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
  281. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js +148 -239
  282. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js +1 -5
  283. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js +1 -1
  284. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js +4 -0
  285. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js +18 -6
  286. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js +1 -16
  287. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm +17 -16
  288. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js +1 -1
  289. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js +55 -38
  290. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js +3 -9
  291. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js +1 -63
  292. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +515 -398
  293. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js +1 -1
  294. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js +122 -112
  295. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm +16 -14
  296. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
  297. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js +1364 -1139
  298. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +44 -11
  299. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js +18 -18
  300. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +15 -14
  301. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js +1 -74
  302. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +11 -11
  303. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm +12 -9
  304. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm +54 -53
  305. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js +1 -1
  306. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js +1 -15
  307. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js +1 -1
  308. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js +1 -1
  309. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js +1 -1
  310. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +36 -20
  311. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm +6 -5
  312. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm +6 -5
  313. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm +6 -5
  314. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm +5 -4
  315. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm +9 -8
  316. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js +1 -1
  317. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js +6 -6
  318. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm +11 -10
  319. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js +1 -16
  320. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js +2 -12
  321. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js +3 -5
  322. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js +4 -13
  323. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js +1 -32
  324. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm +3 -5
  325. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm +5 -5
  326. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm +39 -40
  327. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +10 -9
  328. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js +1 -1
  329. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js +195 -54
  330. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm +51 -51
  331. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
  332. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif +0 -0
  333. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
  334. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif +0 -0
  335. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/pagebreak → themes/advanced}/img/pagebreak.gif +0 -0
  336. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif +0 -0
  337. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/realmedia.gif +0 -0
  338. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif +0 -0
  339. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/trans.gif +0 -0
  340. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif +0 -0
  341. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/windowsmedia.gif +0 -0
  342. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js +1 -0
  343. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js +5 -0
  344. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js +26 -6
  345. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js +108 -32
  346. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +12 -6
  347. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +4 -7
  348. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js +6 -12
  349. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js +1 -62
  350. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -51
  351. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm +27 -28
  352. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm +47 -0
  353. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +14 -1
  354. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
  355. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
  356. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
  357. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css +5 -4
  358. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -0
  359. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +105 -0
  360. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +102 -0
  361. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css +12 -0
  362. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +1 -0
  363. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
  364. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png +0 -0
  365. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png +0 -0
  366. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +8 -6
  367. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +1 -1
  368. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +1 -1
  369. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm +3 -3
  370. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js +1 -1
  371. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +1 -2
  372. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif +0 -0
  373. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js +1 -11
  374. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js +1 -1
  375. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js +1 -1
  376. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js +7838 -5579
  377. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js +1 -1
  378. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js +14 -4
  379. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js +95 -10
  380. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js +35 -3
  381. data/public/skyline/javascripts/src/skyline/src/drag.js +10 -7
  382. data/public/skyline/javascripts/src/skyline/src/layout.js +13 -12
  383. data/public/skyline/javascripts/src/skyline/src/menubutton.js +1 -3
  384. data/public/skyline/javascripts/src/skyline/src/sortable.js +7 -5
  385. data/public/skyline/javascripts/src/skyline/src/tree.js +8 -4
  386. data/public/skyline/javascripts/src/skyline/test/sortable.html +73 -12
  387. data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-core.js +485 -2
  388. data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-more.js +130 -81
  389. data/public/skyline/stylesheets/general.css +23 -6
  390. data/skylinecms.gemspec +45 -0
  391. data/test/mocks/test_article.rb +11 -0
  392. data/test/mocks/test_section.rb +1 -1
  393. data/test/test_helper.rb +2 -1
  394. data/test/unit/article_test.rb +142 -0
  395. data/test/unit/inline_ref_test.rb +38 -16
  396. data/test/unit/test_content_object_test.rb +2 -1
  397. data/vendor/digitpaint/nested_attributes_positioning.rb +1 -1
  398. metadata +207 -487
  399. data/app/helpers/skyline/media_files_helper.rb +0 -7
  400. data/config/initializers/javascript_generator_methods.rb +0 -4
  401. data/config/initializers/rails_defaults.rb +0 -6
  402. data/doc/Bundler.md +0 -76
  403. data/lib/skyline/plugins_manager.rb +0 -150
  404. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/translate.html +0 -84
  405. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css +0 -6
  406. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif +0 -0
  407. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf +0 -0
  408. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif +0 -0
  409. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif +0 -0
  410. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css +0 -1
  411. data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif +0 -0
  412. data/rails/init.rb +0 -32
  413. data/vendor/digitpaint/personify/README.md +0 -86
  414. data/vendor/digitpaint/personify/lib/parser/personify.rb +0 -838
  415. data/vendor/digitpaint/personify/lib/parser/personify.treetop +0 -126
  416. data/vendor/digitpaint/personify/lib/parser/personify_node_classes.rb +0 -7
  417. data/vendor/digitpaint/personify/lib/template.rb +0 -16
  418. data/vendor/digitpaint/personify/personify.rb +0 -7
  419. data/vendor/digitpaint/personify/script/generate_parser.rb +0 -6
  420. data/vendor/digitpaint/personify/test/fixtures/multiple_tags.txt +0 -8
  421. data/vendor/digitpaint/personify/test/parse_runner.rb +0 -25
  422. data/vendor/digitpaint/personify/test/parser_test.rb +0 -109
  423. data/vendor/digitpaint/personify/test/test_helper.rb +0 -16
  424. data/vendor/digitpaint/personify/vendor/treetop/.gitignore +0 -5
  425. data/vendor/digitpaint/personify/vendor/treetop/History.txt +0 -9
  426. data/vendor/digitpaint/personify/vendor/treetop/README +0 -164
  427. data/vendor/digitpaint/personify/vendor/treetop/Rakefile +0 -20
  428. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/grammar ___ end.tmSnippet +0 -20
  429. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/rule ___ end.tmSnippet +0 -18
  430. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Syntaxes/Treetop Grammar.tmLanguage +0 -251
  431. data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/info.plist +0 -10
  432. data/vendor/digitpaint/personify/vendor/treetop/bin/tt +0 -28
  433. data/vendor/digitpaint/personify/vendor/treetop/doc/contributing_and_planned_features.markdown +0 -103
  434. data/vendor/digitpaint/personify/vendor/treetop/doc/grammar_composition.markdown +0 -65
  435. data/vendor/digitpaint/personify/vendor/treetop/doc/index.markdown +0 -90
  436. data/vendor/digitpaint/personify/vendor/treetop/doc/pitfalls_and_advanced_techniques.markdown +0 -51
  437. data/vendor/digitpaint/personify/vendor/treetop/doc/semantic_interpretation.markdown +0 -189
  438. data/vendor/digitpaint/personify/vendor/treetop/doc/site.rb +0 -110
  439. data/vendor/digitpaint/personify/vendor/treetop/doc/sitegen.rb +0 -60
  440. data/vendor/digitpaint/personify/vendor/treetop/doc/syntactic_recognition.markdown +0 -100
  441. data/vendor/digitpaint/personify/vendor/treetop/doc/using_in_ruby.markdown +0 -21
  442. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.rb +0 -551
  443. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.treetop +0 -97
  444. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_node_classes.rb +0 -7
  445. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_test.rb +0 -54
  446. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus +0 -0
  447. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.rb +0 -718
  448. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.treetop +0 -132
  449. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_node_classes.rb +0 -5
  450. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_test.rb +0 -89
  451. data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/test_helper.rb +0 -18
  452. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop.rb +0 -11
  453. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/bootstrap_gen_1_metagrammar.rb +0 -45
  454. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler.rb +0 -6
  455. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/grammar_compiler.rb +0 -40
  456. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/lexical_address_space.rb +0 -17
  457. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.rb +0 -2955
  458. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.treetop +0 -404
  459. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes.rb +0 -19
  460. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/anything_symbol.rb +0 -20
  461. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/atomic_expression.rb +0 -14
  462. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb +0 -22
  463. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/choice.rb +0 -31
  464. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/declaration_sequence.rb +0 -24
  465. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/grammar.rb +0 -28
  466. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/inline_module.rb +0 -27
  467. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/nonterminal.rb +0 -13
  468. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/optional.rb +0 -19
  469. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parenthesized_expression.rb +0 -9
  470. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb +0 -138
  471. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_rule.rb +0 -55
  472. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/predicate.rb +0 -45
  473. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/repetition.rb +0 -55
  474. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb +0 -68
  475. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb +0 -20
  476. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/transient_prefix.rb +0 -9
  477. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/treetop_file.rb +0 -9
  478. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/ruby_builder.rb +0 -113
  479. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions.rb +0 -2
  480. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions/string.rb +0 -42
  481. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime.rb +0 -5
  482. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/compiled_parser.rb +0 -95
  483. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list.rb +0 -4
  484. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb +0 -15
  485. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb +0 -200
  486. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/node.rb +0 -164
  487. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/syntax_node.rb +0 -72
  488. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_parse_failure.rb +0 -16
  489. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_syntax_node.rb +0 -17
  490. data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/version.rb +0 -9
  491. data/vendor/digitpaint/personify/vendor/treetop/script/generate_metagrammar.rb +0 -14
  492. data/vendor/digitpaint/personify/vendor/treetop/script/svnadd +0 -11
  493. data/vendor/digitpaint/personify/vendor/treetop/script/svnrm +0 -11
  494. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/and_predicate_spec.rb +0 -36
  495. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/anything_symbol_spec.rb +0 -52
  496. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/character_class_spec.rb +0 -188
  497. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/choice_spec.rb +0 -80
  498. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/circular_compilation_spec.rb +0 -28
  499. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/failure_propagation_functional_spec.rb +0 -21
  500. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_compiler_spec.rb +0 -84
  501. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_spec.rb +0 -41
  502. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/nonterminal_symbol_spec.rb +0 -40
  503. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/not_predicate_spec.rb +0 -38
  504. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/one_or_more_spec.rb +0 -35
  505. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/optional_spec.rb +0 -37
  506. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parenthesized_expression_spec.rb +0 -19
  507. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parsing_rule_spec.rb +0 -32
  508. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/sequence_spec.rb +0 -115
  509. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_spec.rb +0 -81
  510. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_symbol_spec.rb +0 -37
  511. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.treetop +0 -7
  512. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.tt +0 -7
  513. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar_do.treetop +0 -7
  514. data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/zero_or_more_spec.rb +0 -56
  515. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/a.treetop +0 -11
  516. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/b.treetop +0 -11
  517. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/c.treetop +0 -10
  518. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/d.treetop +0 -10
  519. data/vendor/digitpaint/personify/vendor/treetop/spec/composition/grammar_composition_spec.rb +0 -26
  520. data/vendor/digitpaint/personify/vendor/treetop/spec/ruby_extensions/string_spec.rb +0 -32
  521. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/compiled_parser_spec.rb +0 -101
  522. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/delete_spec.rb +0 -147
  523. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/expire_range_spec.rb +0 -349
  524. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_and_delete_node.rb +0 -385
  525. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_spec.rb +0 -660
  526. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.graffle +0 -6175
  527. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.rb +0 -58
  528. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture.rb +0 -23
  529. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb +0 -164
  530. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/spec_helper.rb +0 -84
  531. data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/syntax_node_spec.rb +0 -53
  532. data/vendor/digitpaint/personify/vendor/treetop/spec/spec_helper.rb +0 -106
  533. data/vendor/digitpaint/personify/vendor/treetop/spec/spec_suite.rb +0 -4
  534. data/vendor/digitpaint/personify/vendor/treetop/treetop.gemspec +0 -18
  535. data/vendor/mootools-on-rails/README +0 -54
  536. data/vendor/mootools-on-rails/Rakefile +0 -22
  537. data/vendor/mootools-on-rails/lib/mootools_on_rails.rb +0 -30
  538. data/vendor/mootools-on-rails/lib/mootools_on_rails/mootools_helper.rb +0 -510
  539. data/vendor/mootools-on-rails/test/mootools_helper_test.rb +0 -138
  540. data/vendor/mootools-on-rails/test/test_helper.rb +0 -5
@@ -1,630 +1,389 @@
1
- tinyMCEPopup.requireLangPack();
1
+ (function() {
2
+ var url;
2
3
 
3
- var oldWidth, oldHeight, ed, url;
4
+ if (url = tinyMCEPopup.getParam("media_external_list_url"))
5
+ document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
4
6
 
5
- if (url = tinyMCEPopup.getParam("media_external_list_url"))
6
- document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
7
-
8
- function init() {
9
- var pl = "", f, val;
10
- var type = "flash", fe, i;
11
-
12
- ed = tinyMCEPopup.editor;
13
-
14
- tinyMCEPopup.resizeToInnerSize();
15
- f = document.forms[0]
16
-
17
- fe = ed.selection.getNode();
18
- if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
19
- pl = fe.title;
20
-
21
- switch (ed.dom.getAttrib(fe, 'class')) {
22
- case 'mceItemFlash':
23
- type = 'flash';
24
- break;
25
-
26
- case 'mceItemFlashVideo':
27
- type = 'flv';
28
- break;
29
-
30
- case 'mceItemShockWave':
31
- type = 'shockwave';
32
- break;
33
-
34
- case 'mceItemWindowsMedia':
35
- type = 'wmp';
36
- break;
37
-
38
- case 'mceItemQuickTime':
39
- type = 'qt';
40
- break;
41
-
42
- case 'mceItemRealMedia':
43
- type = 'rmp';
44
- break;
45
- }
46
-
47
- document.forms[0].insert.value = ed.getLang('update', 'Insert', true);
7
+ function get(id) {
8
+ return document.getElementById(id);
48
9
  }
49
10
 
50
- document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
51
- document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');
52
- document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
53
-
54
- var html = getMediaListHTML('medialist','src','media','media');
55
- if (html == "")
56
- document.getElementById("linklistrow").style.display = 'none';
57
- else
58
- document.getElementById("linklistcontainer").innerHTML = html;
59
-
60
- // Resize some elements
61
- if (isVisible('filebrowser'))
62
- document.getElementById('src').style.width = '230px';
63
-
64
- // Setup form
65
- if (pl != "") {
66
- pl = tinyMCEPopup.editor.plugins.media._parse(pl);
67
-
68
- switch (type) {
69
- case "flash":
70
- setBool(pl, 'flash', 'play');
71
- setBool(pl, 'flash', 'loop');
72
- setBool(pl, 'flash', 'menu');
73
- setBool(pl, 'flash', 'swliveconnect');
74
- setStr(pl, 'flash', 'quality');
75
- setStr(pl, 'flash', 'scale');
76
- setStr(pl, 'flash', 'salign');
77
- setStr(pl, 'flash', 'wmode');
78
- setStr(pl, 'flash', 'base');
79
- setStr(pl, 'flash', 'flashvars');
80
- break;
81
-
82
- case "qt":
83
- setBool(pl, 'qt', 'loop');
84
- setBool(pl, 'qt', 'autoplay');
85
- setBool(pl, 'qt', 'cache');
86
- setBool(pl, 'qt', 'controller');
87
- setBool(pl, 'qt', 'correction');
88
- setBool(pl, 'qt', 'enablejavascript');
89
- setBool(pl, 'qt', 'kioskmode');
90
- setBool(pl, 'qt', 'autohref');
91
- setBool(pl, 'qt', 'playeveryframe');
92
- setBool(pl, 'qt', 'tarsetcache');
93
- setStr(pl, 'qt', 'scale');
94
- setStr(pl, 'qt', 'starttime');
95
- setStr(pl, 'qt', 'endtime');
96
- setStr(pl, 'qt', 'tarset');
97
- setStr(pl, 'qt', 'qtsrcchokespeed');
98
- setStr(pl, 'qt', 'volume');
99
- setStr(pl, 'qt', 'qtsrc');
100
- break;
101
-
102
- case "shockwave":
103
- setBool(pl, 'shockwave', 'sound');
104
- setBool(pl, 'shockwave', 'progress');
105
- setBool(pl, 'shockwave', 'autostart');
106
- setBool(pl, 'shockwave', 'swliveconnect');
107
- setStr(pl, 'shockwave', 'swvolume');
108
- setStr(pl, 'shockwave', 'swstretchstyle');
109
- setStr(pl, 'shockwave', 'swstretchhalign');
110
- setStr(pl, 'shockwave', 'swstretchvalign');
111
- break;
112
-
113
- case "wmp":
114
- setBool(pl, 'wmp', 'autostart');
115
- setBool(pl, 'wmp', 'enabled');
116
- setBool(pl, 'wmp', 'enablecontextmenu');
117
- setBool(pl, 'wmp', 'fullscreen');
118
- setBool(pl, 'wmp', 'invokeurls');
119
- setBool(pl, 'wmp', 'mute');
120
- setBool(pl, 'wmp', 'stretchtofit');
121
- setBool(pl, 'wmp', 'windowlessvideo');
122
- setStr(pl, 'wmp', 'balance');
123
- setStr(pl, 'wmp', 'baseurl');
124
- setStr(pl, 'wmp', 'captioningid');
125
- setStr(pl, 'wmp', 'currentmarker');
126
- setStr(pl, 'wmp', 'currentposition');
127
- setStr(pl, 'wmp', 'defaultframe');
128
- setStr(pl, 'wmp', 'playcount');
129
- setStr(pl, 'wmp', 'rate');
130
- setStr(pl, 'wmp', 'uimode');
131
- setStr(pl, 'wmp', 'volume');
132
- break;
133
-
134
- case "rmp":
135
- setBool(pl, 'rmp', 'autostart');
136
- setBool(pl, 'rmp', 'loop');
137
- setBool(pl, 'rmp', 'autogotourl');
138
- setBool(pl, 'rmp', 'center');
139
- setBool(pl, 'rmp', 'imagestatus');
140
- setBool(pl, 'rmp', 'maintainaspect');
141
- setBool(pl, 'rmp', 'nojava');
142
- setBool(pl, 'rmp', 'prefetch');
143
- setBool(pl, 'rmp', 'shuffle');
144
- setStr(pl, 'rmp', 'console');
145
- setStr(pl, 'rmp', 'controls');
146
- setStr(pl, 'rmp', 'numloop');
147
- setStr(pl, 'rmp', 'scriptcallbacks');
148
- break;
149
- }
150
-
151
- setStr(pl, null, 'src');
152
- setStr(pl, null, 'id');
153
- setStr(pl, null, 'name');
154
- setStr(pl, null, 'vspace');
155
- setStr(pl, null, 'hspace');
156
- setStr(pl, null, 'bgcolor');
157
- setStr(pl, null, 'align');
158
- setStr(pl, null, 'width');
159
- setStr(pl, null, 'height');
160
-
161
- if ((val = ed.dom.getAttrib(fe, "width")) != "")
162
- pl.width = f.width.value = val;
163
-
164
- if ((val = ed.dom.getAttrib(fe, "height")) != "")
165
- pl.height = f.height.value = val;
166
-
167
- oldWidth = pl.width ? parseInt(pl.width) : 0;
168
- oldHeight = pl.height ? parseInt(pl.height) : 0;
169
- } else
170
- oldWidth = oldHeight = 0;
171
-
172
- selectByValue(f, 'media_type', type);
173
- changedType(type);
174
- updateColor('bgcolor_pick', 'bgcolor');
11
+ function getVal(id) {
12
+ var elm = get(id);
175
13
 
176
- TinyMCE_EditableSelects.init();
177
- generatePreview();
178
- }
14
+ if (elm.nodeName == "SELECT")
15
+ return elm.options[elm.selectedIndex].value;
179
16
 
180
- function insertMedia() {
181
- var fe, f = document.forms[0], h;
17
+ if (elm.type == "checkbox")
18
+ return elm.checked;
182
19
 
183
- tinyMCEPopup.restoreSelection();
184
-
185
- if (!AutoValidator.validate(f)) {
186
- tinyMCEPopup.alert(ed.getLang('invalid_data'));
187
- return false;
20
+ return elm.value;
188
21
  }
189
22
 
190
- f.width.value = f.width.value == "" ? 100 : f.width.value;
191
- f.height.value = f.height.value == "" ? 100 : f.height.value;
192
-
193
- fe = ed.selection.getNode();
194
- if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
195
- switch (f.media_type.options[f.media_type.selectedIndex].value) {
196
- case "flash":
197
- fe.className = "mceItemFlash";
198
- break;
199
-
200
- case "flv":
201
- fe.className = "mceItemFlashVideo";
202
- break;
203
-
204
- case "shockwave":
205
- fe.className = "mceItemShockWave";
206
- break;
207
-
208
- case "qt":
209
- fe.className = "mceItemQuickTime";
210
- break;
211
-
212
- case "wmp":
213
- fe.className = "mceItemWindowsMedia";
214
- break;
215
-
216
- case "rmp":
217
- fe.className = "mceItemRealMedia";
218
- break;
219
- }
220
-
221
- if (fe.width != f.width.value || fe.height != f.height.value)
222
- ed.execCommand('mceRepaint');
223
-
224
- fe.title = serializeParameters();
225
- fe.width = f.width.value;
226
- fe.height = f.height.value;
227
- fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');
228
- fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');
229
- fe.align = f.align.options[f.align.selectedIndex].value;
230
- } else {
231
- h = '<img src="' + tinyMCEPopup.getWindowArg("plugin_url") + '/img/trans.gif"' ;
232
-
233
- switch (f.media_type.options[f.media_type.selectedIndex].value) {
234
- case "flash":
235
- h += ' class="mceItemFlash"';
236
- break;
237
-
238
- case "flv":
239
- h += ' class="mceItemFlashVideo"';
240
- break;
241
-
242
- case "shockwave":
243
- h += ' class="mceItemShockWave"';
244
- break;
245
-
246
- case "qt":
247
- h += ' class="mceItemQuickTime"';
248
- break;
249
-
250
- case "wmp":
251
- h += ' class="mceItemWindowsMedia"';
252
- break;
253
-
254
- case "rmp":
255
- h += ' class="mceItemRealMedia"';
256
- break;
23
+ function setVal(id, value, name) {
24
+ if (typeof(value) != 'undefined') {
25
+ var elm = get(id);
26
+
27
+ if (elm.nodeName == "SELECT")
28
+ selectByValue(document.forms[0], id, value);
29
+ else if (elm.type == "checkbox") {
30
+ if (typeof(value) == 'string') {
31
+ value = value.toLowerCase();
32
+ value = (!name && value === 'true') || (name && value === name.toLowerCase());
33
+ }
34
+ elm.checked = !!value;
35
+ } else
36
+ elm.value = value;
257
37
  }
258
-
259
- h += ' title="' + serializeParameters() + '"';
260
- h += ' width="' + f.width.value + '"';
261
- h += ' height="' + f.height.value + '"';
262
- h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';
263
-
264
- h += ' />';
265
-
266
- ed.execCommand('mceInsertContent', false, h);
267
- }
268
-
269
- tinyMCEPopup.close();
270
- }
271
-
272
- function updatePreview() {
273
- var f = document.forms[0], type;
274
-
275
- f.width.value = f.width.value || '320';
276
- f.height.value = f.height.value || '240';
277
-
278
- type = getType(f.src.value);
279
- selectByValue(f, 'media_type', type);
280
- changedType(type);
281
- generatePreview();
282
- }
283
-
284
- function getMediaListHTML() {
285
- if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
286
- var html = "";
287
-
288
- html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;updatePreview();">';
289
- html += '<option value="">---</option>';
290
-
291
- for (var i=0; i<tinyMCEMediaList.length; i++)
292
- html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
293
-
294
- html += '</select>';
295
-
296
- return html;
297
- }
298
-
299
- return "";
300
- }
301
-
302
- function getType(v) {
303
- var fo, i, c, el, x, f = document.forms[0];
304
-
305
- fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');
306
-
307
- // YouTube
308
- if (v.match(/watch\?v=(.+)(.*)/)) {
309
- f.width.value = '425';
310
- f.height.value = '350';
311
- f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];
312
- return 'flash';
313
38
  }
314
39
 
315
- // Google video
316
- if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {
317
- f.width.value = '425';
318
- f.height.value = '326';
319
- f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';
320
- return 'flash';
321
- }
322
-
323
- for (i=0; i<fo.length; i++) {
324
- c = fo[i].split('=');
325
-
326
- el = c[1].split(',');
327
- for (x=0; x<el.length; x++)
328
- if (v.indexOf('.' + el[x]) != -1)
329
- return c[0];
330
- }
331
-
332
- return null;
333
- }
334
-
335
- function switchType(v) {
336
- var t = getType(v), d = document, f = d.forms[0];
337
-
338
- if (!t)
339
- return;
340
-
341
- selectByValue(d.forms[0], 'media_type', t);
342
- changedType(t);
343
-
344
- // Update qtsrc also
345
- if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {
346
- alert(ed.getLang("media_qt_stream_warn"));
347
-
348
- if (f.qt_qtsrc.value == '')
349
- f.qt_qtsrc.value = f.src.value;
350
- }
351
- }
352
-
353
- function changedType(t) {
354
- var d = document;
355
-
356
- d.getElementById('flash_options').style.display = 'none';
357
- d.getElementById('flv_options').style.display = 'none';
358
- d.getElementById('qt_options').style.display = 'none';
359
- d.getElementById('shockwave_options').style.display = 'none';
360
- d.getElementById('wmp_options').style.display = 'none';
361
- d.getElementById('rmp_options').style.display = 'none';
362
-
363
- if (t)
364
- d.getElementById(t + '_options').style.display = 'block';
365
- }
366
-
367
- function serializeParameters() {
368
- var d = document, f = d.forms[0], s = '';
369
-
370
- switch (f.media_type.options[f.media_type.selectedIndex].value) {
371
- case "flash":
372
- s += getBool('flash', 'play', true);
373
- s += getBool('flash', 'loop', true);
374
- s += getBool('flash', 'menu', true);
375
- s += getBool('flash', 'swliveconnect', false);
376
- s += getStr('flash', 'quality');
377
- s += getStr('flash', 'scale');
378
- s += getStr('flash', 'salign');
379
- s += getStr('flash', 'wmode');
380
- s += getStr('flash', 'base');
381
- s += getStr('flash', 'flashvars');
382
- break;
383
-
384
- case "qt":
385
- s += getBool('qt', 'loop', false);
386
- s += getBool('qt', 'autoplay', true);
387
- s += getBool('qt', 'cache', false);
388
- s += getBool('qt', 'controller', true);
389
- s += getBool('qt', 'correction', false, 'none', 'full');
390
- s += getBool('qt', 'enablejavascript', false);
391
- s += getBool('qt', 'kioskmode', false);
392
- s += getBool('qt', 'autohref', false);
393
- s += getBool('qt', 'playeveryframe', false);
394
- s += getBool('qt', 'targetcache', false);
395
- s += getStr('qt', 'scale');
396
- s += getStr('qt', 'starttime');
397
- s += getStr('qt', 'endtime');
398
- s += getStr('qt', 'target');
399
- s += getStr('qt', 'qtsrcchokespeed');
400
- s += getStr('qt', 'volume');
401
- s += getStr('qt', 'qtsrc');
402
- break;
403
-
404
- case "shockwave":
405
- s += getBool('shockwave', 'sound');
406
- s += getBool('shockwave', 'progress');
407
- s += getBool('shockwave', 'autostart');
408
- s += getBool('shockwave', 'swliveconnect');
409
- s += getStr('shockwave', 'swvolume');
410
- s += getStr('shockwave', 'swstretchstyle');
411
- s += getStr('shockwave', 'swstretchhalign');
412
- s += getStr('shockwave', 'swstretchvalign');
413
- break;
414
-
415
- case "wmp":
416
- s += getBool('wmp', 'autostart', true);
417
- s += getBool('wmp', 'enabled', false);
418
- s += getBool('wmp', 'enablecontextmenu', true);
419
- s += getBool('wmp', 'fullscreen', false);
420
- s += getBool('wmp', 'invokeurls', true);
421
- s += getBool('wmp', 'mute', false);
422
- s += getBool('wmp', 'stretchtofit', false);
423
- s += getBool('wmp', 'windowlessvideo', false);
424
- s += getStr('wmp', 'balance');
425
- s += getStr('wmp', 'baseurl');
426
- s += getStr('wmp', 'captioningid');
427
- s += getStr('wmp', 'currentmarker');
428
- s += getStr('wmp', 'currentposition');
429
- s += getStr('wmp', 'defaultframe');
430
- s += getStr('wmp', 'playcount');
431
- s += getStr('wmp', 'rate');
432
- s += getStr('wmp', 'uimode');
433
- s += getStr('wmp', 'volume');
434
- break;
435
-
436
- case "rmp":
437
- s += getBool('rmp', 'autostart', false);
438
- s += getBool('rmp', 'loop', false);
439
- s += getBool('rmp', 'autogotourl', true);
440
- s += getBool('rmp', 'center', false);
441
- s += getBool('rmp', 'imagestatus', true);
442
- s += getBool('rmp', 'maintainaspect', false);
443
- s += getBool('rmp', 'nojava', false);
444
- s += getBool('rmp', 'prefetch', false);
445
- s += getBool('rmp', 'shuffle', false);
446
- s += getStr('rmp', 'console');
447
- s += getStr('rmp', 'controls');
448
- s += getStr('rmp', 'numloop');
449
- s += getStr('rmp', 'scriptcallbacks');
450
- break;
451
- }
452
-
453
- s += getStr(null, 'id');
454
- s += getStr(null, 'name');
455
- s += getStr(null, 'src');
456
- s += getStr(null, 'align');
457
- s += getStr(null, 'bgcolor');
458
- s += getInt(null, 'vspace');
459
- s += getInt(null, 'hspace');
460
- s += getStr(null, 'width');
461
- s += getStr(null, 'height');
462
-
463
- s = s.length > 0 ? s.substring(0, s.length - 1) : s;
464
-
465
- return s;
466
- }
467
-
468
- function setBool(pl, p, n) {
469
- if (typeof(pl[n]) == "undefined")
470
- return;
471
-
472
- document.forms[0].elements[p + "_" + n].checked = pl[n] != 'false';
473
- }
474
-
475
- function setStr(pl, p, n) {
476
- var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];
477
-
478
- if (typeof(pl[n]) == "undefined")
479
- return;
480
-
481
- if (e.type == "text")
482
- e.value = pl[n];
483
- else
484
- selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);
485
- }
486
-
487
- function getBool(p, n, d, tv, fv) {
488
- var v = document.forms[0].elements[p + "_" + n].checked;
489
-
490
- tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
491
- fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
492
-
493
- return (v == d) ? '' : n + (v ? ':' + tv + ',' : ":\'" + fv + "\',");
494
- }
40
+ window.Media = {
41
+ init : function() {
42
+ var html, editor;
43
+
44
+ this.editor = editor = tinyMCEPopup.editor;
495
45
 
496
- function getStr(p, n, d) {
497
- var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
498
- var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
499
-
500
- if (n == 'src')
501
- v = tinyMCEPopup.editor.convertURL(v, 'src', null);
502
-
503
- return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");
504
- }
505
-
506
- function getInt(p, n, d) {
507
- var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
508
- var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
509
-
510
- return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");
511
- }
512
-
513
- function jsEncode(s) {
514
- s = s.replace(new RegExp('\\\\', 'g'), '\\\\');
515
- s = s.replace(new RegExp('"', 'g'), '\\"');
516
- s = s.replace(new RegExp("'", 'g'), "\\'");
46
+ // Setup file browsers and color pickers
47
+ get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
48
+ get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');
49
+ get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
50
+ get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource1','video_altsource1','media','media');
51
+ get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource2','video_altsource2','media','media');
52
+ get('audio_altsource1_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource1','audio_altsource1','media','media');
53
+ get('audio_altsource2_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource2','audio_altsource2','media','media');
54
+ get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');
55
+
56
+ html = this.getMediaListHTML('medialist', 'src', 'media', 'media');
57
+ if (html == "")
58
+ get("linklistrow").style.display = 'none';
59
+ else
60
+ get("linklistcontainer").innerHTML = html;
61
+
62
+ if (isVisible('filebrowser'))
63
+ get('src').style.width = '230px';
64
+
65
+ if (isVisible('video_filebrowser_altsource1'))
66
+ get('video_altsource1').style.width = '220px';
67
+
68
+ if (isVisible('video_filebrowser_altsource2'))
69
+ get('video_altsource2').style.width = '220px';
70
+
71
+ if (isVisible('audio_filebrowser_altsource1'))
72
+ get('audio_altsource1').style.width = '220px';
73
+
74
+ if (isVisible('audio_filebrowser_altsource2'))
75
+ get('audio_altsource2').style.width = '220px';
76
+
77
+ if (isVisible('filebrowser_poster'))
78
+ get('video_poster').style.width = '220px';
79
+
80
+ this.data = tinyMCEPopup.getWindowArg('data');
81
+ this.dataToForm();
82
+ this.preview();
83
+ },
84
+
85
+ insert : function() {
86
+ var editor = tinyMCEPopup.editor;
87
+
88
+ this.formToData();
89
+ editor.execCommand('mceRepaint');
90
+ tinyMCEPopup.restoreSelection();
91
+ editor.selection.setNode(editor.plugins.media.dataToImg(this.data));
92
+ tinyMCEPopup.close();
93
+ },
94
+
95
+ preview : function() {
96
+ get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);
97
+ },
98
+
99
+ moveStates : function(to_form, field) {
100
+ var data = this.data, editor = this.editor, data = this.data,
101
+ mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;
102
+
103
+ defaultStates = {
104
+ // QuickTime
105
+ quicktime_autoplay : true,
106
+ quicktime_controller : true,
107
+
108
+ // Flash
109
+ flash_play : true,
110
+ flash_loop : true,
111
+ flash_menu : true,
112
+
113
+ // WindowsMedia
114
+ windowsmedia_autostart : true,
115
+ windowsmedia_enablecontextmenu : true,
116
+ windowsmedia_invokeurls : true,
117
+
118
+ // RealMedia
119
+ realmedia_autogotourl : true,
120
+ realmedia_imagestatus : true
121
+ };
122
+
123
+ function parseQueryParams(str) {
124
+ var out = {};
125
+
126
+ if (str) {
127
+ tinymce.each(str.split('&'), function(item) {
128
+ var parts = item.split('=');
129
+
130
+ out[unescape(parts[0])] = unescape(parts[1]);
131
+ });
132
+ }
133
+
134
+ return out;
135
+ };
136
+
137
+ function setOptions(type, names) {
138
+ var i, name, formItemName, value, list;
139
+
140
+ if (type == data.type || type == 'global') {
141
+ names = tinymce.explode(names);
142
+ for (i = 0; i < names.length; i++) {
143
+ name = names[i];
144
+ formItemName = type == 'global' ? name : type + '_' + name;
145
+
146
+ if (type == 'global')
147
+ list = data;
148
+ else if (type == 'video' || type == 'audio') {
149
+ list = data.video.attrs;
150
+
151
+ if (!list && !to_form)
152
+ data.video.attrs = list = {};
153
+ } else
154
+ list = data.params;
155
+
156
+ if (list) {
157
+ if (to_form) {
158
+ setVal(formItemName, list[name], type == 'video' || type == 'audio' ? name : '');
159
+ } else {
160
+ delete list[name];
161
+
162
+ value = getVal(formItemName);
163
+ if ((type == 'video' || type == 'audio') && value === true)
164
+ value = name;
165
+
166
+ if (defaultStates[formItemName]) {
167
+ if (value !== defaultStates[formItemName]) {
168
+ value = "" + value;
169
+ list[name] = value;
170
+ }
171
+ } else if (value) {
172
+ value = "" + value;
173
+ list[name] = value;
174
+ }
175
+ }
176
+ }
177
+ }
178
+ }
179
+ }
517
180
 
518
- return s;
519
- }
181
+ if (!to_form) {
182
+ data.type = get('media_type').options[get('media_type').selectedIndex].value;
183
+ data.width = getVal('width');
184
+ data.height = getVal('height');
520
185
 
521
- function generatePreview(c) {
522
- var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;
186
+ // Switch type based on extension
187
+ src = getVal('src');
188
+ if (field == 'src') {
189
+ ext = src.replace(/^.*\.([^.]+)$/, '$1');
190
+ if (typeInfo = mediaPlugin.getType(ext))
191
+ data.type = typeInfo.name.toLowerCase();
523
192
 
524
- p.innerHTML = '<!-- x --->';
193
+ setVal('media_type', data.type);
194
+ }
525
195
 
526
- nw = parseInt(f.width.value);
527
- nh = parseInt(f.height.value);
196
+ if (data.type == "video" || data.type == "audio") {
197
+ if (!data.video.sources)
198
+ data.video.sources = [];
528
199
 
529
- if (f.width.value != "" && f.height.value != "") {
530
- if (f.constrain.checked) {
531
- if (c == 'width' && oldWidth != 0) {
532
- wp = nw / oldWidth;
533
- nh = Math.round(wp * nh);
534
- f.height.value = nh;
535
- } else if (c == 'height' && oldHeight != 0) {
536
- hp = nh / oldHeight;
537
- nw = Math.round(hp * nw);
538
- f.width.value = nw;
200
+ data.video.sources[0] = {src: getVal('src')};
201
+ }
539
202
  }
540
- }
541
- }
542
203
 
543
- if (f.width.value != "")
544
- oldWidth = nw;
545
-
546
- if (f.height.value != "")
547
- oldHeight = nh;
548
-
549
- // After constrain
550
- pl = serializeParameters();
551
-
552
- switch (f.media_type.options[f.media_type.selectedIndex].value) {
553
- case "flash":
554
- cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
555
- codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
556
- type = 'application/x-shockwave-flash';
557
- break;
558
-
559
- case "shockwave":
560
- cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';
561
- codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
562
- type = 'application/x-director';
563
- break;
564
-
565
- case "qt":
566
- cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
567
- codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
568
- type = 'video/quicktime';
569
- break;
570
-
571
- case "wmp":
572
- cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';
573
- codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
574
- type = 'application/x-mplayer2';
575
- break;
576
-
577
- case "rmp":
578
- cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';
579
- codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
580
- type = 'audio/x-pn-realaudio-plugin';
581
- break;
582
- }
583
-
584
- if (pl == '') {
585
- p.innerHTML = '';
586
- return;
587
- }
204
+ // Hide all fieldsets and show the one active
205
+ get('video_options').style.display = 'none';
206
+ get('audio_options').style.display = 'none';
207
+ get('flash_options').style.display = 'none';
208
+ get('quicktime_options').style.display = 'none';
209
+ get('shockwave_options').style.display = 'none';
210
+ get('windowsmedia_options').style.display = 'none';
211
+ get('realmedia_options').style.display = 'none';
212
+
213
+ if (get(data.type + '_options'))
214
+ get(data.type + '_options').style.display = 'block';
215
+
216
+ setVal('media_type', data.type);
217
+
218
+ setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');
219
+ setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');
220
+ setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');
221
+ setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');
222
+ setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');
223
+ setOptions('video', 'poster,autoplay,loop,muted,preload,controls');
224
+ setOptions('audio', 'autoplay,loop,preload,controls');
225
+ setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');
226
+
227
+ if (to_form) {
228
+ if (data.type == 'video') {
229
+ if (data.video.sources[0])
230
+ setVal('src', data.video.sources[0].src);
231
+
232
+ src = data.video.sources[1];
233
+ if (src)
234
+ setVal('video_altsource1', src.src);
235
+
236
+ src = data.video.sources[2];
237
+ if (src)
238
+ setVal('video_altsource2', src.src);
239
+ } else if (data.type == 'audio') {
240
+ if (data.video.sources[0])
241
+ setVal('src', data.video.sources[0].src);
242
+
243
+ src = data.video.sources[1];
244
+ if (src)
245
+ setVal('audio_altsource1', src.src);
246
+
247
+ src = data.video.sources[2];
248
+ if (src)
249
+ setVal('audio_altsource2', src.src);
250
+ } else {
251
+ // Check flash vars
252
+ if (data.type == 'flash') {
253
+ tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {
254
+ if (value == '$url')
255
+ data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;
256
+ });
257
+ }
258
+
259
+ setVal('src', data.params.src);
260
+ }
261
+ } else {
262
+ src = getVal("src");
263
+
264
+ // YouTube
265
+ if (src.match(/youtube.com(.+)v=([^&]+)/)) {
266
+ data.width = 425;
267
+ data.height = 350;
268
+ data.params.frameborder = '0';
269
+ data.type = 'iframe';
270
+ src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
271
+ setVal('src', src);
272
+ setVal('media_type', data.type);
273
+ }
274
+
275
+ // Google video
276
+ if (src.match(/video.google.com(.+)docid=([^&]+)/)) {
277
+ data.width = 425;
278
+ data.height = 326;
279
+ data.type = 'flash';
280
+ src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';
281
+ setVal('src', src);
282
+ setVal('media_type', data.type);
283
+ }
284
+
285
+ if (data.type == 'video') {
286
+ if (!data.video.sources)
287
+ data.video.sources = [];
288
+
289
+ data.video.sources[0] = {src : src};
290
+
291
+ src = getVal("video_altsource1");
292
+ if (src)
293
+ data.video.sources[1] = {src : src};
294
+
295
+ src = getVal("video_altsource2");
296
+ if (src)
297
+ data.video.sources[2] = {src : src};
298
+ } else if (data.type == 'audio') {
299
+ if (!data.video.sources)
300
+ data.video.sources = [];
301
+
302
+ data.video.sources[0] = {src : src};
303
+
304
+ src = getVal("audio_altsource1");
305
+ if (src)
306
+ data.video.sources[1] = {src : src};
307
+
308
+ src = getVal("audio_altsource2");
309
+ if (src)
310
+ data.video.sources[2] = {src : src};
311
+ } else
312
+ data.params.src = src;
313
+
314
+ // Set default size
315
+ setVal('width', data.width || (data.type == 'audio' ? 300 : 320));
316
+ setVal('height', data.height || (data.type == 'audio' ? 32 : 240));
317
+ }
318
+ },
319
+
320
+ dataToForm : function() {
321
+ this.moveStates(true);
322
+ },
323
+
324
+ formToData : function(field) {
325
+ if (field == "width" || field == "height")
326
+ this.changeSize(field);
327
+
328
+ if (field == 'source') {
329
+ this.moveStates(false, field);
330
+ setVal('source', this.editor.plugins.media.dataToHtml(this.data));
331
+ this.panel = 'source';
332
+ } else {
333
+ if (this.panel == 'source') {
334
+ this.data = this.editor.plugins.media.htmlToData(getVal('source'));
335
+ this.dataToForm();
336
+ this.panel = '';
337
+ }
338
+
339
+ this.moveStates(false, field);
340
+ this.preview();
341
+ }
342
+ },
343
+
344
+ beforeResize : function() {
345
+ this.width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);
346
+ this.height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);
347
+ },
348
+
349
+ changeSize : function(type) {
350
+ var width, height, scale, size;
351
+
352
+ if (get('constrain').checked) {
353
+ width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);
354
+ height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);
355
+
356
+ if (type == 'width') {
357
+ this.height = Math.round((width / this.width) * height);
358
+ setVal('height', this.height);
359
+ } else {
360
+ this.width = Math.round((height / this.height) * width);
361
+ setVal('width', this.width);
362
+ }
363
+ }
364
+ },
588
365
 
589
- pl = tinyMCEPopup.editor.plugins.media._parse(pl);
366
+ getMediaListHTML : function() {
367
+ if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
368
+ var html = "";
590
369
 
591
- if (!pl.src) {
592
- p.innerHTML = '';
593
- return;
594
- }
370
+ html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
371
+ html += '<option value="">---</option>';
595
372
 
596
- pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);
597
- pl.width = !pl.width ? 100 : pl.width;
598
- pl.height = !pl.height ? 100 : pl.height;
599
- pl.id = !pl.id ? 'obj' : pl.id;
600
- pl.name = !pl.name ? 'eobj' : pl.name;
601
- pl.align = !pl.align ? '' : pl.align;
373
+ for (var i=0; i<tinyMCEMediaList.length; i++)
374
+ html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
602
375
 
603
- // Avoid annoying warning about insecure items
604
- if (!tinymce.isIE || document.location.protocol != 'https:') {
605
- h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
376
+ html += '</select>';
606
377
 
607
- for (n in pl) {
608
- h += '<param name="' + n + '" value="' + pl[n] + '">';
378
+ return html;
379
+ }
609
380
 
610
- // Add extra url parameter if it's an absolute URL
611
- if (n == 'src' && pl[n].indexOf('://') != -1)
612
- h += '<param name="url" value="' + pl[n] + '" />';
381
+ return "";
613
382
  }
614
- }
615
-
616
- h += '<embed type="' + type + '" ';
617
-
618
- for (n in pl)
619
- h += n + '="' + pl[n] + '" ';
620
-
621
- h += '></embed>';
622
-
623
- // Avoid annoying warning about insecure items
624
- if (!tinymce.isIE || document.location.protocol != 'https:')
625
- h += '</object>';
626
-
627
- p.innerHTML = "<!-- x --->" + h;
628
- }
383
+ };
629
384
 
630
- tinyMCEPopup.onInit.add(init);
385
+ tinyMCEPopup.requireLangPack();
386
+ tinyMCEPopup.onInit.add(function() {
387
+ Media.init();
388
+ });
389
+ })();