skylinecms 3.1.0 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +5 -0
- data/CHANGELOG +51 -1
- data/Gemfile +8 -0
- data/Rakefile +0 -43
- data/app/controllers/skyline/application_controller.rb +30 -26
- data/app/controllers/skyline/articles_controller.rb +8 -28
- data/app/controllers/skyline/authentications_controller.rb +6 -8
- data/app/controllers/skyline/browser/links_controller.rb +12 -8
- data/app/controllers/skyline/browser/tabs/linkables_controller.rb +9 -0
- data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb +0 -12
- data/app/controllers/skyline/content/editors/editable_list_controller.rb +0 -4
- data/app/controllers/skyline/content/editors/joinable_list_controller.rb +1 -19
- data/app/controllers/skyline/content_controller.rb +14 -30
- data/app/controllers/skyline/content_items_controller.rb +3 -9
- data/app/controllers/skyline/content_sections_controller.rb +3 -10
- data/app/controllers/skyline/link_section_links_controller.rb +2 -10
- data/app/controllers/skyline/media/data_controller.rb +24 -14
- data/app/controllers/skyline/media/dirs_controller.rb +12 -26
- data/app/controllers/skyline/media/files_controller.rb +12 -28
- data/app/controllers/skyline/publications_controller.rb +0 -12
- data/app/controllers/skyline/published_publications_controller.rb +0 -4
- data/app/controllers/skyline/sections_controller.rb +4 -18
- data/app/controllers/skyline/site/media_files_data_controller.rb +11 -13
- data/app/controllers/skyline/site/pages_controller.rb +4 -3
- data/app/controllers/skyline/skyline2_controller.rb +1 -1
- data/app/controllers/skyline/users_controller.rb +7 -31
- data/app/controllers/skyline/variant_current_editor_controller.rb +5 -5
- data/app/controllers/skyline/variants_controller.rb +3 -3
- data/app/helpers/skyline/application_helper.rb +16 -5
- data/app/helpers/skyline/button_helper.rb +12 -18
- data/app/helpers/skyline/content_helper.rb +11 -11
- data/app/helpers/skyline/dialog_helper.rb +3 -2
- data/app/helpers/skyline/editors/checkable_list.rb +4 -2
- data/app/helpers/skyline/editors/date_time.rb +1 -1
- data/app/helpers/skyline/editors/display.rb +1 -1
- data/app/helpers/skyline/editors/editable_list.rb +13 -8
- data/app/helpers/skyline/editors/editor.rb +10 -10
- data/app/helpers/skyline/editors/list.rb +2 -2
- data/app/helpers/skyline/editors/page_browser.rb +1 -0
- data/app/helpers/skyline/editors/wysiwyg.rb +2 -3
- data/app/helpers/skyline/form_helper.rb +36 -0
- data/app/helpers/skyline/media/files_helper.rb +1 -1
- data/app/helpers/skyline/message_generator.rb +13 -4
- data/app/helpers/skyline/pages_helper.rb +1 -1
- data/app/helpers/skyline/plugin_helper.rb +1 -1
- data/app/helpers/skyline/presenters/presenter.rb +12 -8
- data/app/helpers/skyline/ref_object_helper.rb +9 -7
- data/app/helpers/skyline/translation_helper.rb +1 -1
- data/app/helpers/skyline/tree_helper.rb +1 -3
- data/app/middleware/skyline/flash_session_cookie_middleware.rb +6 -1
- data/app/middleware/skyline/plugins_loader_middleware.rb +1 -1
- data/app/middleware/skyline/sprockets_middleware.rb +1 -1
- data/app/models/skyline/article.rb +94 -26
- data/app/models/skyline/article_version.rb +22 -9
- data/app/models/skyline/image_ref.rb +1 -1
- data/app/models/skyline/inline_ref.rb +78 -62
- data/app/models/skyline/link_ref.rb +1 -1
- data/app/models/skyline/media_cache.rb +4 -2
- data/app/models/skyline/media_file.rb +2 -5
- data/app/models/skyline/media_node.rb +2 -2
- data/app/models/skyline/object_ref.rb +2 -2
- data/app/models/skyline/page.rb +8 -6
- data/app/models/skyline/page_fragment.rb +4 -2
- data/app/models/skyline/publication.rb +1 -1
- data/app/models/skyline/sections/content_collection_section.rb +1 -1
- data/app/models/skyline/sections/link_section.rb +1 -1
- data/app/models/skyline/user.rb +17 -7
- data/app/models/skyline/user_preference.rb +1 -1
- data/app/models/skyline/variant.rb +11 -5
- data/app/templates/skyline/page/default/index.html.erb +1 -1
- data/app/templates/skyline/sections/raw_section/default/index.html.erb +1 -1
- data/app/templates/skyline/sections/wysiwyg_section/default/index.html.erb +1 -1
- data/app/views/skyline/articles/_currently_editing.html.erb +1 -1
- data/app/views/skyline/articles/_meta.html.erb +24 -11
- data/app/views/skyline/articles/_security.html.erb +2 -2
- data/app/views/skyline/articles/_takeover_action.html.erb +1 -1
- data/app/views/skyline/articles/edit.html.erb +29 -16
- data/app/views/skyline/articles/edit_preview_only.html.erb +2 -2
- data/app/views/skyline/articles/index.html.erb +2 -2
- data/app/views/skyline/articles/page/_header.html.erb +1 -1
- data/app/views/skyline/articles/page/_index.html.erb +9 -3
- data/app/views/skyline/articles/page_fragment/_index.html.erb +7 -2
- data/app/views/skyline/articles/update.js.erb +20 -0
- data/app/views/skyline/authentications/new.html.erb +1 -1
- data/app/views/skyline/browser/links/_index.html.erb +2 -0
- data/app/views/skyline/browser/tabs/linkables/_index.html.erb +29 -0
- data/app/views/skyline/browser/tabs/linkables/_show.html.erb +67 -0
- data/app/views/skyline/browser/tabs/linkables/show.js.erb +4 -0
- data/app/views/skyline/browser/tabs/media_library/_index.html.erb +2 -2
- data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb +4 -35
- data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb +1 -3
- data/app/views/skyline/browser/tabs/media_library/media_files/index.js.erb +1 -0
- data/app/views/skyline/browser/tabs/media_library/media_files/show.js.erb +1 -0
- data/app/views/skyline/browser/tabs/pages/_index.html.erb +1 -1
- data/app/views/skyline/content/_add.rhtml +6 -1
- data/app/views/skyline/content/_filter.rhtml +1 -1
- data/app/views/skyline/content/_import.html.erb +1 -1
- data/app/views/skyline/content/_index.html.erb +2 -2
- data/app/views/skyline/content/_meta.html.erb +2 -2
- data/app/views/skyline/content/create.rhtml +1 -1
- data/app/views/skyline/content/edit.rhtml +1 -1
- data/app/views/skyline/content/editors/editable_list/new.js.erb +2 -0
- data/app/views/skyline/content/editors/joinable_list/_add.html.erb +17 -10
- data/app/views/skyline/content/editors/joinable_list/_list.html.erb +24 -8
- data/app/views/skyline/content/editors/joinable_list/cancel.js.erb +1 -0
- data/app/views/skyline/content/editors/joinable_list/index.js.erb +1 -0
- data/app/views/skyline/content/editors/joinable_list/new.js.erb +5 -0
- data/app/views/skyline/content/field.js.erb +2 -0
- data/app/views/skyline/content/import.js.erb +4 -0
- data/app/views/skyline/content/order.js.erb +6 -0
- data/app/views/skyline/content/presenters/_table.html.erb +1 -1
- data/app/views/skyline/content_items/_content_item.html.erb +2 -2
- data/app/views/skyline/content_items/new.js.erb +6 -0
- data/app/views/skyline/content_sections/_tags.html.erb +2 -2
- data/app/views/skyline/content_sections/new.js.erb +6 -0
- data/app/views/skyline/link_section_links/_form.html.erb +1 -1
- data/app/views/skyline/link_section_links/new.js.erb +4 -0
- data/app/views/skyline/locales/show.js.erb +3 -3
- data/app/views/skyline/media/dirs/_edit.html.erb +9 -7
- data/app/views/skyline/media/dirs/edit.js.erb +1 -0
- data/app/views/skyline/media/dirs/index.html.erb +16 -6
- data/app/views/skyline/media/dirs/index.js.erb +6 -0
- data/app/views/skyline/media/dirs/show.js.erb +5 -0
- data/app/views/skyline/media/files/_edit.html.erb +13 -11
- data/app/views/skyline/media/files/_index.html.erb +2 -2
- data/app/views/skyline/media/files/_new.html.erb +2 -2
- data/app/views/skyline/media/files/edit.js.erb +4 -0
- data/app/views/skyline/media/files/index.js.erb +4 -0
- data/app/views/skyline/media/files/update.js.erb +8 -0
- data/app/views/skyline/publications/_index.html.erb +2 -2
- data/app/views/skyline/publications/index.js.erb +9 -0
- data/app/views/skyline/sections/_content_collection_section.html.erb +6 -6
- data/app/views/skyline/sections/_content_item_section.html.erb +1 -1
- data/app/views/skyline/sections/_form.html.erb +4 -4
- data/app/views/skyline/sections/_link_section.html.erb +6 -1
- data/app/views/skyline/sections/_splitter_section.html.erb +1 -1
- data/app/views/skyline/sections/_wysiwyg_section.html.erb +2 -2
- data/app/views/skyline/sections/new.js.erb +12 -0
- data/app/views/skyline/settings/edit.html.erb +1 -1
- data/app/views/skyline/shared/_head.html.erb +3 -0
- data/app/views/skyline/shared/_header_area.html.erb +5 -5
- data/app/views/skyline/users/_edit.html.erb +1 -1
- data/app/views/skyline/users/_form.html.erb +1 -1
- data/app/views/skyline/users/_new.html.erb +1 -1
- data/app/views/skyline/users/create.js.erb +2 -0
- data/app/views/skyline/users/edit.js.erb +1 -0
- data/app/views/skyline/users/index.html.erb +21 -6
- data/app/views/skyline/users/new.js.erb +1 -0
- data/app/views/skyline/users/update.js.erb +2 -0
- data/config/initializers/dependencies.rb +1 -17
- data/config/initializers/gem_dependencies.rb +10 -0
- data/config/initializers/locales.rb +8 -1
- data/config/initializers/middlewares.rb +7 -3
- data/config/initializers/observers.rb +6 -4
- data/config/locales/en-US.yml +44 -34
- data/config/locales/nl-NL.yml +45 -33
- data/config/routes.rb +65 -74
- data/db/migrate/20090508145820_create_skyline_pages.rb +2 -2
- data/db/migrate/20090508145852_create_skyline_page_versions.rb +2 -2
- data/db/migrate/20090508150149_create_skyline_sections.rb +1 -1
- data/db/migrate/20090610142139_add_skyline_tags_taggable_type.rb +2 -2
- data/db/migrate/20090624154251_create_skyline_link_section_links.rb +1 -1
- data/db/migrate/20100120113953_remove_unused_articles_index.rb +1 -1
- data/db/migrate/20110816080626_add_skyline_test_article_data.rb +13 -0
- data/db/migrate/20111101092405_rename_indexes.rb +24 -0
- data/doc/INSTALL.md +54 -27
- data/doc/MIGRATION.md +27 -2
- data/lib/skyline.rb +2 -1
- data/lib/skyline/authentication/user.rb +80 -0
- data/lib/skyline/belongs_to_referable.rb +1 -1
- data/lib/skyline/cli/init.rb +14 -26
- data/lib/skyline/cli/init/templates/config/initializers/skyline_configuration.rb +0 -1
- data/lib/skyline/configuration.rb +74 -32
- data/lib/skyline/content/content.rb +7 -6
- data/lib/skyline/content/field_meta_data.rb +2 -2
- data/lib/skyline/content/stack.rb +1 -1
- data/lib/skyline/content_item_section_selectable.rb +4 -4
- data/lib/skyline/deprecated/version3_0_8.rb +2 -2
- data/lib/skyline/engine.rb +37 -0
- data/lib/skyline/form_builder.rb +8 -8
- data/lib/skyline/linkable.rb +28 -0
- data/lib/skyline/plugins/manager.rb +77 -0
- data/lib/skyline/plugins/plugin.rb +89 -0
- data/lib/skyline/rendering/helpers/renderer_helper.rb +1 -1
- data/lib/skyline/rendering/renderer.rb +27 -13
- data/lib/skyline/route_constraint.rb +15 -0
- data/lib/skyline/settings.rb +9 -7
- data/lib/skyline/taggable.rb +2 -2
- data/lib/skyline/version.rb +4 -4
- data/lib/skylinecms.rb +5 -3
- data/lib/tasks/database.rake +2 -2
- data/public/skyline/javascripts/src/application.js +5 -4
- data/public/skyline/javascripts/src/rails.js +165 -0
- data/public/skyline/javascripts/src/sections.js +6 -9
- data/public/skyline/javascripts/src/skyline.editor/src/plugins/autoresize/editor_plugin.js +72 -27
- data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylineimage/dialog.js +13 -12
- data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylinelink/dialog.js +7 -7
- data/public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js +4 -3
- data/public/skyline/javascripts/src/skyline.editor/src/theme.js +101 -536
- data/public/skyline/javascripts/src/skyline.editor/test/multiple_editors.html +1 -0
- data/public/skyline/javascripts/src/skyline.editor/test/single.html +56 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/changelog.txt +1410 -1091
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/accessibility.html +101 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/custom_formats.html +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full.html +12 -12
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/lists/media_list.js +5 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/media/sample.flv +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/menu.html +2 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/skins.html +4 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/word.html +3 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/langs/en.js +1 -170
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js +1 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +30 -29
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm +34 -31
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +32 -13
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js +1 -43
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js +21 -17
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js +1 -52
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm +35 -30
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js +31 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js +172 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js +23 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js +14 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +34 -21
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm +15 -14
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js +1 -20
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js +50 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css +3 -42
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js +315 -63
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm +18 -330
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +199 -438
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js +1 -85
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js +12 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm +2 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +80 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js +2 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +31 -28
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js +781 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js +703 -295
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js +361 -602
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js +1 -103
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm +365 -285
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +4 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js +7 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js +1 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js +148 -239
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js +1 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js +4 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js +18 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js +1 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm +17 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js +55 -38
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js +3 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js +1 -63
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +515 -398
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js +122 -112
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm +16 -14
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js +1364 -1139
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +44 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js +18 -18
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +15 -14
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js +1 -74
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +11 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm +12 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm +54 -53
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js +1 -15
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +36 -20
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm +6 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm +6 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm +6 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm +9 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js +6 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm +11 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js +1 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js +2 -12
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js +3 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js +4 -13
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js +1 -32
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm +3 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm +5 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm +39 -40
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +10 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js +195 -54
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm +51 -51
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/pagebreak → themes/advanced}/img/pagebreak.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/realmedia.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/trans.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/windowsmedia.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js +5 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js +26 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js +108 -32
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +12 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +4 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js +6 -12
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js +1 -62
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -51
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm +27 -28
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm +47 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +14 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +105 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +102 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css +12 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +8 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm +3 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +1 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js +1 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js +7838 -5579
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js +14 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js +95 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js +35 -3
- data/public/skyline/javascripts/src/skyline/src/drag.js +10 -7
- data/public/skyline/javascripts/src/skyline/src/layout.js +13 -12
- data/public/skyline/javascripts/src/skyline/src/menubutton.js +1 -3
- data/public/skyline/javascripts/src/skyline/src/sortable.js +7 -5
- data/public/skyline/javascripts/src/skyline/src/tree.js +8 -4
- data/public/skyline/javascripts/src/skyline/test/sortable.html +73 -12
- data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-core.js +485 -2
- data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-more.js +130 -81
- data/public/skyline/stylesheets/general.css +23 -6
- data/skylinecms.gemspec +45 -0
- data/test/mocks/test_article.rb +11 -0
- data/test/mocks/test_section.rb +1 -1
- data/test/test_helper.rb +2 -1
- data/test/unit/article_test.rb +142 -0
- data/test/unit/inline_ref_test.rb +38 -16
- data/test/unit/test_content_object_test.rb +2 -1
- data/vendor/digitpaint/nested_attributes_positioning.rb +1 -1
- metadata +207 -487
- data/app/helpers/skyline/media_files_helper.rb +0 -7
- data/config/initializers/javascript_generator_methods.rb +0 -4
- data/config/initializers/rails_defaults.rb +0 -6
- data/doc/Bundler.md +0 -76
- data/lib/skyline/plugins_manager.rb +0 -150
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/translate.html +0 -84
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css +0 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif +0 -0
- data/rails/init.rb +0 -32
- data/vendor/digitpaint/personify/README.md +0 -86
- data/vendor/digitpaint/personify/lib/parser/personify.rb +0 -838
- data/vendor/digitpaint/personify/lib/parser/personify.treetop +0 -126
- data/vendor/digitpaint/personify/lib/parser/personify_node_classes.rb +0 -7
- data/vendor/digitpaint/personify/lib/template.rb +0 -16
- data/vendor/digitpaint/personify/personify.rb +0 -7
- data/vendor/digitpaint/personify/script/generate_parser.rb +0 -6
- data/vendor/digitpaint/personify/test/fixtures/multiple_tags.txt +0 -8
- data/vendor/digitpaint/personify/test/parse_runner.rb +0 -25
- data/vendor/digitpaint/personify/test/parser_test.rb +0 -109
- data/vendor/digitpaint/personify/test/test_helper.rb +0 -16
- data/vendor/digitpaint/personify/vendor/treetop/.gitignore +0 -5
- data/vendor/digitpaint/personify/vendor/treetop/History.txt +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/README +0 -164
- data/vendor/digitpaint/personify/vendor/treetop/Rakefile +0 -20
- data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/grammar ___ end.tmSnippet +0 -20
- data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/rule ___ end.tmSnippet +0 -18
- data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Syntaxes/Treetop Grammar.tmLanguage +0 -251
- data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/info.plist +0 -10
- data/vendor/digitpaint/personify/vendor/treetop/bin/tt +0 -28
- data/vendor/digitpaint/personify/vendor/treetop/doc/contributing_and_planned_features.markdown +0 -103
- data/vendor/digitpaint/personify/vendor/treetop/doc/grammar_composition.markdown +0 -65
- data/vendor/digitpaint/personify/vendor/treetop/doc/index.markdown +0 -90
- data/vendor/digitpaint/personify/vendor/treetop/doc/pitfalls_and_advanced_techniques.markdown +0 -51
- data/vendor/digitpaint/personify/vendor/treetop/doc/semantic_interpretation.markdown +0 -189
- data/vendor/digitpaint/personify/vendor/treetop/doc/site.rb +0 -110
- data/vendor/digitpaint/personify/vendor/treetop/doc/sitegen.rb +0 -60
- data/vendor/digitpaint/personify/vendor/treetop/doc/syntactic_recognition.markdown +0 -100
- data/vendor/digitpaint/personify/vendor/treetop/doc/using_in_ruby.markdown +0 -21
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.rb +0 -551
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.treetop +0 -97
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_node_classes.rb +0 -7
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_test.rb +0 -54
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus +0 -0
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.rb +0 -718
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.treetop +0 -132
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_node_classes.rb +0 -5
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_test.rb +0 -89
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/test_helper.rb +0 -18
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop.rb +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/bootstrap_gen_1_metagrammar.rb +0 -45
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler.rb +0 -6
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/grammar_compiler.rb +0 -40
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/lexical_address_space.rb +0 -17
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.rb +0 -2955
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.treetop +0 -404
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes.rb +0 -19
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/anything_symbol.rb +0 -20
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/atomic_expression.rb +0 -14
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb +0 -22
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/choice.rb +0 -31
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/declaration_sequence.rb +0 -24
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/grammar.rb +0 -28
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/inline_module.rb +0 -27
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/nonterminal.rb +0 -13
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/optional.rb +0 -19
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parenthesized_expression.rb +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb +0 -138
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_rule.rb +0 -55
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/predicate.rb +0 -45
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/repetition.rb +0 -55
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb +0 -68
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb +0 -20
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/transient_prefix.rb +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/treetop_file.rb +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/ruby_builder.rb +0 -113
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions.rb +0 -2
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions/string.rb +0 -42
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime.rb +0 -5
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/compiled_parser.rb +0 -95
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list.rb +0 -4
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb +0 -15
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb +0 -200
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/node.rb +0 -164
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/syntax_node.rb +0 -72
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_parse_failure.rb +0 -16
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_syntax_node.rb +0 -17
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/version.rb +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/script/generate_metagrammar.rb +0 -14
- data/vendor/digitpaint/personify/vendor/treetop/script/svnadd +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/script/svnrm +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/and_predicate_spec.rb +0 -36
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/anything_symbol_spec.rb +0 -52
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/character_class_spec.rb +0 -188
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/choice_spec.rb +0 -80
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/circular_compilation_spec.rb +0 -28
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/failure_propagation_functional_spec.rb +0 -21
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_compiler_spec.rb +0 -84
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_spec.rb +0 -41
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/nonterminal_symbol_spec.rb +0 -40
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/not_predicate_spec.rb +0 -38
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/one_or_more_spec.rb +0 -35
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/optional_spec.rb +0 -37
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parenthesized_expression_spec.rb +0 -19
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parsing_rule_spec.rb +0 -32
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/sequence_spec.rb +0 -115
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_spec.rb +0 -81
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_symbol_spec.rb +0 -37
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.treetop +0 -7
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.tt +0 -7
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar_do.treetop +0 -7
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/zero_or_more_spec.rb +0 -56
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/a.treetop +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/b.treetop +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/c.treetop +0 -10
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/d.treetop +0 -10
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/grammar_composition_spec.rb +0 -26
- data/vendor/digitpaint/personify/vendor/treetop/spec/ruby_extensions/string_spec.rb +0 -32
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/compiled_parser_spec.rb +0 -101
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/delete_spec.rb +0 -147
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/expire_range_spec.rb +0 -349
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_and_delete_node.rb +0 -385
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_spec.rb +0 -660
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.graffle +0 -6175
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.rb +0 -58
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture.rb +0 -23
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb +0 -164
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/spec_helper.rb +0 -84
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/syntax_node_spec.rb +0 -53
- data/vendor/digitpaint/personify/vendor/treetop/spec/spec_helper.rb +0 -106
- data/vendor/digitpaint/personify/vendor/treetop/spec/spec_suite.rb +0 -4
- data/vendor/digitpaint/personify/vendor/treetop/treetop.gemspec +0 -18
- data/vendor/mootools-on-rails/README +0 -54
- data/vendor/mootools-on-rails/Rakefile +0 -22
- data/vendor/mootools-on-rails/lib/mootools_on_rails.rb +0 -30
- data/vendor/mootools-on-rails/lib/mootools_on_rails/mootools_helper.rb +0 -510
- data/vendor/mootools-on-rails/test/mootools_helper_test.rb +0 -138
- data/vendor/mootools-on-rails/test/test_helper.rb +0 -5
@@ -1,12 +1,12 @@
|
|
1
|
-
#id, #name, #hspace, #vspace, #class_name, #align {
|
1
|
+
#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
|
2
2
|
#hspace, #vspace { width: 50px }
|
3
3
|
#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
|
4
|
-
#flash_base, #flash_flashvars { width: 240px }
|
4
|
+
#flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { width: 240px }
|
5
5
|
#width, #height { width: 40px }
|
6
6
|
#src, #media_type { width: 250px }
|
7
7
|
#class { width: 120px }
|
8
|
-
#prev { margin: 0; border: 1px solid black; width: 380px; height:
|
9
|
-
.panel_wrapper div.current { height:
|
8
|
+
#prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }
|
9
|
+
.panel_wrapper div.current { height: 420px; overflow: auto }
|
10
10
|
#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
|
11
11
|
.mceAddSelectValue { background-color: #DDDDDD }
|
12
12
|
#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
|
@@ -14,3 +14,4 @@
|
|
14
14
|
#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
|
15
15
|
#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
|
16
16
|
#qt_qtsrc { width: 200px }
|
17
|
+
iframe {border: 1px solid gray}
|
@@ -1 +1 @@
|
|
1
|
-
(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.MediaPlugin",{init:function(b,c){var e=this;e.editor=b;e.url=c;function f(g){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(g.className)}b.onPreInit.add(function(){b.serializer.addRules("param[name|value|_mce_value]")});b.addCommand("mceMedia",function(){b.windowManager.open({file:c+"/media.htm",width:430+parseInt(b.getLang("media.delta_width",0)),height:470+parseInt(b.getLang("media.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("media",{title:"media.desc",cmd:"mceMedia"});b.onNodeChange.add(function(h,g,i){g.setActive("media",i.nodeName=="IMG"&&f(i))});b.onInit.add(function(){var g={mceItemFlash:"flash",mceItemShockWave:"shockwave",mceItemWindowsMedia:"windowsmedia",mceItemQuickTime:"quicktime",mceItemRealMedia:"realmedia"};b.selection.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.selection.onBeforeSetContent.add(e._objectsToSpans,e);if(b.settings.content_css!==false){b.dom.loadCSS(c+"/css/content.css")}if(b.theme&&b.theme.onResolveName){b.theme.onResolveName.add(function(h,i){if(i.name=="img"){a(g,function(l,j){if(b.dom.hasClass(i.node,j)){i.name=l;i.title=b.dom.getAttrib(i.node,"title");return false}})}})}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(i,h,j){if(j.nodeName=="IMG"&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(j.className)){h.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});b.onBeforeSetContent.add(e._objectsToSpans,e);b.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.onPreProcess.add(function(g,i){var h=g.dom;if(i.set){e._spansToImgs(i.node);a(h.select("IMG",i.node),function(k){var j;if(f(k)){j=e._parse(k.title);h.setAttrib(k,"width",h.getAttrib(k,"width",j.width||100));h.setAttrib(k,"height",h.getAttrib(k,"height",j.height||100))}})}if(i.get){a(h.select("IMG",i.node),function(m){var l,j,k;if(g.getParam("media_use_script")){if(f(m)){m.className=m.className.replace(/mceItem/g,"mceTemp")}return}switch(m.className){case"mceItemFlash":l="d27cdb6e-ae6d-11cf-96b8-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="application/x-shockwave-flash";break;case"mceItemShockWave":l="166b1bca-3f9c-11cf-8075-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0";k="application/x-director";break;case"mceItemWindowsMedia":l=g.getParam("media_wmp6_compatible")?"05589fa1-c356-11ce-bf01-00aa0055595a":"6bf52a52-394a-11d3-b153-00c04f79faa6";j="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701";k="application/x-mplayer2";break;case"mceItemQuickTime":l="02bf25d5-8c17-4b23-bc80-d3488abddc6b";j="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0";k="video/quicktime";break;case"mceItemRealMedia":l="cfcdaa03-8be4-11cf-b84b-0020afbbccfa";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="audio/x-pn-realaudio-plugin";break}if(l){h.replace(e._buildObj({classid:l,codebase:j,type:k},m),m)}})}});b.onPostProcess.add(function(g,h){h.content=h.content.replace(/_mce_value=/g,"value=")});function d(g,h){h=new RegExp(h+'="([^"]+)"',"g").exec(g);return h?b.dom.decode(h[1]):""}b.onPostProcess.add(function(g,h){if(g.getParam("media_use_script")){h.content=h.content.replace(/<img[^>]+>/g,function(j){var i=d(j,"class");if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(i)){at=e._parse(d(j,"title"));at.width=d(j,"width");at.height=d(j,"height");j='<script type="text/javascript">write'+i.substring(7)+"({"+e._serialize(at)+"});<\/script>"}return j})}})},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_objectsToSpans:function(b,e){var c=this,d=e.content;d=d.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(g,f,i){var h=c._parse(i);return'<img class="mceItem'+f+'" title="'+b.dom.encode(i)+'" src="'+c.url+'/img/trans.gif" width="'+h.width+'" height="'+h.height+'" />'});d=d.replace(/<object([^>]*)>/gi,'<span class="mceItemObject" $1>');d=d.replace(/<embed([^>]*)\/?>/gi,'<span class="mceItemEmbed" $1></span>');d=d.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');d=d.replace(/<\/(object)([^>]*)>/gi,"</span>");d=d.replace(/<\/embed>/gi,"");d=d.replace(/<param([^>]*)>/gi,function(g,f){return"<span "+f.replace(/value=/gi,"_mce_value=")+' class="mceItemParam"></span>'});d=d.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');e.content=d},_buildObj:function(g,h){var d,c=this.editor,f=c.dom,e=this._parse(h.title),b;b=c.getParam("media_strict",true)&&g.type=="application/x-shockwave-flash";e.width=g.width=f.getAttrib(h,"width")||100;e.height=g.height=f.getAttrib(h,"height")||100;if(e.src){e.src=c.convertURL(e.src,"src",h)}if(b){d=f.create("span",{id:e.id,_mce_name:"object",type:"application/x-shockwave-flash",data:e.src,style:f.getAttrib(h,"style"),width:g.width,height:g.height})}else{d=f.create("span",{id:e.id,_mce_name:"object",classid:"clsid:"+g.classid,style:f.getAttrib(h,"style"),codebase:g.codebase,width:g.width,height:g.height})}a(e,function(j,i){if(!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(i)){if(g.type=="application/x-mplayer2"&&i=="src"&&!e.url){i="url"}if(j){f.add(d,"span",{_mce_name:"param",name:i,_mce_value:j})}}});if(!b){f.add(d,"span",tinymce.extend({_mce_name:"embed",type:g.type,style:f.getAttrib(h,"style")},e))}return d},_spansToImgs:function(e){var d=this,f=d.editor.dom,b,c;a(f.select("span",e),function(g){if(f.getAttrib(g,"class")=="mceItemObject"){c=f.getAttrib(g,"classid").toLowerCase().replace(/\s+/g,"");switch(c){case"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000":f.replace(d._createImg("mceItemFlash",g),g);break;case"clsid:166b1bca-3f9c-11cf-8075-444553540000":f.replace(d._createImg("mceItemShockWave",g),g);break;case"clsid:6bf52a52-394a-11d3-b153-00c04f79faa6":case"clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95":case"clsid:05589fa1-c356-11ce-bf01-00aa0055595a":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}return}if(f.getAttrib(g,"class")=="mceItemEmbed"){switch(f.getAttrib(g,"type")){case"application/x-shockwave-flash":f.replace(d._createImg("mceItemFlash",g),g);break;case"application/x-director":f.replace(d._createImg("mceItemShockWave",g),g);break;case"application/x-mplayer2":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"video/quicktime":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"audio/x-pn-realaudio-plugin":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}}})},_createImg:function(c,h){var b,g=this.editor.dom,f={},e="",d;d=["id","name","width","height","bgcolor","align","flashvars","src","wmode","allowfullscreen","quality","data"];b=g.create("img",{src:this.url+"/img/trans.gif",width:g.getAttrib(h,"width")||100,height:g.getAttrib(h,"height")||100,style:g.getAttrib(h,"style"),"class":c});a(d,function(i){var j=g.getAttrib(h,i);if(j){f[i]=j}});a(g.select("span",h),function(i){if(g.hasClass(i,"mceItemParam")){f[g.getAttrib(i,"name")]=g.getAttrib(i,"_mce_value")}});if(f.movie){f.src=f.movie;delete f.movie}if(!f.src){f.src=f.data;delete f.data}h=g.select(".mceItemEmbed",h)[0];if(h){a(d,function(i){var j=g.getAttrib(h,i);if(j&&!f[i]){f[i]=j}})}delete f.width;delete f.height;b.title=this._serialize(f);return b},_parse:function(b){return tinymce.util.JSON.parse("{"+b+"}")},_serialize:function(b){return tinymce.util.JSON.serialize(b).replace(/[{}]/g,"")}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
|
1
|
+
(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["Audio"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar;audio=mp3,ogg").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=n.dom.getAttrib(i,"data-mce-json");if(s){s=g.parse(s);tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||(m.type=="audio"?"300":"320");n.height=m.height||(m.type=="audio"?"32":"240");return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{forced_root_block:"",force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(x,n){var t=this,o=t.editor,A,F,j,s,G,w,E,u,k,C,r,p,y,B,m,v,l,z,D;function q(i,H){var L,K,M,J,I;I=o.getParam("flash_video_player_url",t.convertUrl(t.url+"/moxieplayer.swf"));if(I){L=o.documentBaseURI;E.params.src=I;if(o.getParam("flash_video_player_absvideourl",true)){i=L.toAbsolute(i||"",true);H=L.toAbsolute(H||"",true)}M="";K=o.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(K,function(O,N){O=O.replace(/\$url/,i||"");O=O.replace(/\$poster/,H||"");if(O.length>0){M+=(M?"&":"")+N+"="+escape(O)}});if(M.length){E.params.flashvars=M}J=o.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(J,function(O,N){E.params[N]=""+O})}}E=x.attr("data-mce-json");if(!E){return}E=g.parse(E);p=this.getType(x.attr("class"));z=x.attr("data-mce-style");if(!z){z=x.attr("style");if(z){z=o.dom.serializeStyle(o.dom.parseStyle(z,"img"))}}if(p.name==="Iframe"){v=new b("iframe",1);tinymce.each(d,function(i){var H=x.attr(i);if(i=="class"&&H){H=H.replace(/mceItem.+ ?/g,"")}if(H&&H.length>0){v.attr(i,H)}});for(G in E.params){v.attr(G,E.params[G])}v.attr({style:z,src:E.params.src});x.replace(v);return}if(this.editor.settings.media_use_script){v=new b("script",1).attr("type","text/javascript");w=new b("#text",3);w.value="write"+p.name+"("+g.serialize(tinymce.extend(E.params,{width:x.attr("width"),height:x.attr("height")}))+");";v.append(w);x.replace(v);return}if(p.name==="Video"&&E.video.sources[0]){A=new b("video",1).attr(tinymce.extend({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z},E.video.attrs));if(E.video.attrs){l=E.video.attrs.poster}k=E.video.sources=c(E.video.sources);for(y=0;y<k.length;y++){if(/\.mp4$/.test(k[y].src)){m=k[y].src}}if(!k[0].type){A.attr("src",k[0].src);k.splice(0,1)}for(y=0;y<k.length;y++){u=new b("source",1).attr(k[y]);u.shortEnded=true;A.append(u)}if(m){q(m,l);p=t.getType("flash")}else{E.params.src=""}}if(p.name==="Audio"&&E.video.sources[0]){D=new b("audio",1).attr(tinymce.extend({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z},E.video.attrs));if(E.video.attrs){l=E.video.attrs.poster}k=E.video.sources=c(E.video.sources);if(!k[0].type){D.attr("src",k[0].src);k.splice(0,1)}for(y=0;y<k.length;y++){u=new b("source",1).attr(k[y]);u.shortEnded=true;D.append(u)}E.params.src=""}if(E.params.src){if(/\.flv$/i.test(E.params.src)){q(E.params.src,"")}if(n&&n.force_absolute){E.params.src=o.documentBaseURI.toAbsolute(E.params.src)}F=new b("object",1).attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z});tinymce.each(d,function(i){if(E[i]&&i!="type"){F.attr(i,E[i])}});for(G in E.params){r=new b("param",1);r.shortEnded=true;w=E.params[G];if(G==="src"&&p.name==="WindowsMedia"){G="url"}r.attr({name:G,value:w});F.append(r)}if(this.editor.getParam("media_strict",true)){F.attr({data:E.params.src,type:p.mimes[0]})}else{F.attr({classid:"clsid:"+p.clsids[0],codebase:p.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z,type:p.mimes[0]});for(G in E.params){j.attr(G,E.params[G])}tinymce.each(d,function(i){if(E[i]&&i!="type"){j.attr(i,E[i])}});F.append(j)}if(E.object_html){w=new b("#text",3);w.raw=true;w.value=E.object_html;F.append(w)}if(A){A.append(F)}}if(A){if(E.video_html){w=new b("#text",3);w.raw=true;w.value=E.video_html;A.append(w)}}if(D){if(E.video_html){w=new b("#text",3);w.raw=true;w.value=E.video_html;D.append(w)}}if(A||D||F){x.replace(A||D||F)}else{x.remove()}},objectToImg:function(y){var F,j,A,p,G,H,u,w,t,B,z,q,o,D,x,k,E,n,C=this.lookup,l,v,s=this.editor.settings.url_converter,m=this.editor.settings.url_converter_scope;function r(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}if(!y.parent){return}if(y.name==="script"){if(y.firstChild){l=a.exec(y.firstChild.value)}if(!l){return}n=l[1];E={video:{},params:g.parse(l[2])};w=E.params.width;t=E.params.height}E=E||{video:{},params:{}};G=new b("img",1);G.attr({src:this.editor.theme.url+"/img/trans.gif"});H=y.name;if(H==="video"||H=="audio"){A=y;F=y.getAll("object")[0];j=y.getAll("embed")[0];w=A.attr("width");t=A.attr("height");u=A.attr("id");E.video={attrs:{},sources:[]};v=E.video.attrs;for(H in A.attributes.map){v[H]=A.attributes.map[H]}x=y.attr("src");if(x){E.video.sources.push({src:s.call(m,x,"src",y.name)})}k=A.getAll("source");for(z=0;z<k.length;z++){x=k[z].remove();E.video.sources.push({src:s.call(m,x.attr("src"),"src","source"),type:x.attr("type"),media:x.attr("media")})}if(v.poster){v.poster=s.call(m,v.poster,"poster",y.name)}}if(y.name==="object"){F=y;j=y.getAll("embed")[0]}if(y.name==="embed"){j=y}if(y.name==="iframe"){p=y;n="Iframe"}if(F){w=w||F.attr("width");t=t||F.attr("height");B=B||F.attr("style");u=u||F.attr("id");D=F.getAll("param");for(z=0;z<D.length;z++){o=D[z];H=o.remove().attr("name");if(!h[H]){E.params[H]=o.attr("value")}}E.params.src=E.params.src||F.attr("data")}if(j){w=w||j.attr("width");t=t||j.attr("height");B=B||j.attr("style");u=u||j.attr("id");for(H in j.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=j.attributes.map[H]}}}if(p){w=p.attr("width");t=p.attr("height");B=B||p.attr("style");u=p.attr("id");tinymce.each(d,function(i){G.attr(i,p.attr(i))});for(H in p.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=p.attributes.map[H]}}}if(E.params.movie){E.params.src=E.params.src||E.params.movie;delete E.params.movie}if(E.params.src){E.params.src=s.call(m,E.params.src,"src","object")}if(A){if(y.name==="video"){n=C.video.name}else{if(y.name==="audio"){n=C.audio.name}}}if(F&&!n){n=(C[(F.attr("clsid")||"").toLowerCase()]||C[(F.attr("type")||"").toLowerCase()]||{}).name}if(j&&!n){n=(C[(j.attr("type")||"").toLowerCase()]||{}).name}y.replace(G);if(j){j.remove()}if(F){q=r(F.remove());if(q){E.object_html=q}}if(A){q=r(A.remove());if(q){E.video_html=q}}G.attr({id:u,"class":"mceItemMedia mceItem"+(n||"Flash"),style:B,width:w||(y.name=="audio"?"300":"320"),height:t||(y.name=="audio"?"32":"240"),"data-mce-json":g.serialize(E,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
|
@@ -9,187 +9,210 @@
|
|
9
9
|
*/
|
10
10
|
|
11
11
|
(function() {
|
12
|
-
var
|
12
|
+
var rootAttributes = tinymce.explode('id,name,width,height,style,align,class,hspace,vspace,bgcolor,type'), excludedAttrs = tinymce.makeMap(rootAttributes.join(',')), Node = tinymce.html.Node,
|
13
|
+
mediaTypes, scriptRegExp, JSON = tinymce.util.JSON, mimeTypes;
|
14
|
+
|
15
|
+
// Media types supported by this plugin
|
16
|
+
mediaTypes = [
|
17
|
+
// Type, clsid:s, mime types, codebase
|
18
|
+
["Flash", "d27cdb6e-ae6d-11cf-96b8-444553540000", "application/x-shockwave-flash", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],
|
19
|
+
["ShockWave", "166b1bca-3f9c-11cf-8075-444553540000", "application/x-director", "http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],
|
20
|
+
["WindowsMedia", "6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a", "application/x-mplayer2", "http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],
|
21
|
+
["QuickTime", "02bf25d5-8c17-4b23-bc80-d3488abddc6b", "video/quicktime", "http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],
|
22
|
+
["RealMedia", "cfcdaa03-8be4-11cf-b84b-0020afbbccfa", "audio/x-pn-realaudio-plugin", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],
|
23
|
+
["Java", "8ad9c840-044e-11d1-b3e9-00805f499d93", "application/x-java-applet", "http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],
|
24
|
+
["Silverlight", "dfeaf541-f3e1-4c24-acac-99c30715084a", "application/x-silverlight-2"],
|
25
|
+
["Iframe"],
|
26
|
+
["Video"],
|
27
|
+
["Audio"]
|
28
|
+
];
|
29
|
+
|
30
|
+
function toArray(obj) {
|
31
|
+
var undef, out, i;
|
32
|
+
|
33
|
+
if (obj && !obj.splice) {
|
34
|
+
out = [];
|
35
|
+
|
36
|
+
for (i = 0; true; i++) {
|
37
|
+
if (obj[i])
|
38
|
+
out[i] = obj[i];
|
39
|
+
else
|
40
|
+
break;
|
41
|
+
}
|
42
|
+
|
43
|
+
return out;
|
44
|
+
}
|
45
|
+
|
46
|
+
return obj;
|
47
|
+
};
|
13
48
|
|
14
49
|
tinymce.create('tinymce.plugins.MediaPlugin', {
|
15
50
|
init : function(ed, url) {
|
16
|
-
var
|
17
|
-
|
18
|
-
t.editor = ed;
|
19
|
-
t.url = url;
|
51
|
+
var self = this, lookup = {}, i, y, item, name;
|
20
52
|
|
21
|
-
function
|
22
|
-
return
|
53
|
+
function isMediaImg(node) {
|
54
|
+
return node && node.nodeName === 'IMG' && ed.dom.hasClass(node, 'mceItemMedia');
|
23
55
|
};
|
24
56
|
|
25
|
-
|
26
|
-
|
27
|
-
ed.serializer.addRules('param[name|value|_mce_value]');
|
28
|
-
});
|
57
|
+
self.editor = ed;
|
58
|
+
self.url = url;
|
29
59
|
|
30
|
-
//
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
|
35
|
-
height : 470 + parseInt(ed.getLang('media.delta_height', 0)),
|
36
|
-
inline : 1
|
37
|
-
}, {
|
38
|
-
plugin_url : url
|
39
|
-
});
|
40
|
-
});
|
60
|
+
// Parse media types into a lookup table
|
61
|
+
scriptRegExp = '';
|
62
|
+
for (i = 0; i < mediaTypes.length; i++) {
|
63
|
+
name = mediaTypes[i][0];
|
41
64
|
|
42
|
-
|
43
|
-
|
65
|
+
item = {
|
66
|
+
name : name,
|
67
|
+
clsids : tinymce.explode(mediaTypes[i][1] || ''),
|
68
|
+
mimes : tinymce.explode(mediaTypes[i][2] || ''),
|
69
|
+
codebase : mediaTypes[i][3]
|
70
|
+
};
|
71
|
+
|
72
|
+
for (y = 0; y < item.clsids.length; y++)
|
73
|
+
lookup['clsid:' + item.clsids[y]] = item;
|
74
|
+
|
75
|
+
for (y = 0; y < item.mimes.length; y++)
|
76
|
+
lookup[item.mimes[y]] = item;
|
44
77
|
|
45
|
-
|
46
|
-
|
78
|
+
lookup['mceItem' + name] = item;
|
79
|
+
lookup[name.toLowerCase()] = item;
|
80
|
+
|
81
|
+
scriptRegExp += (scriptRegExp ? '|' : '') + name;
|
82
|
+
}
|
83
|
+
|
84
|
+
// Handle the media_types setting
|
85
|
+
tinymce.each(ed.getParam("media_types",
|
86
|
+
"video=mp4,m4v,ogv,webm;" +
|
87
|
+
"silverlight=xap;" +
|
88
|
+
"flash=swf,flv;" +
|
89
|
+
"shockwave=dcr;" +
|
90
|
+
"quicktime=mov,qt,mpg,mpeg;" +
|
91
|
+
"shockwave=dcr;" +
|
92
|
+
"windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;" +
|
93
|
+
"realmedia=rm,ra,ram;" +
|
94
|
+
"java=jar;" +
|
95
|
+
"audio=mp3,ogg"
|
96
|
+
).split(';'), function(item) {
|
97
|
+
var i, extensions, type;
|
98
|
+
|
99
|
+
item = item.split(/=/);
|
100
|
+
extensions = tinymce.explode(item[1].toLowerCase());
|
101
|
+
for (i = 0; i < extensions.length; i++) {
|
102
|
+
type = lookup[item[0].toLowerCase()];
|
103
|
+
|
104
|
+
if (type)
|
105
|
+
lookup[extensions[i]] = type;
|
106
|
+
}
|
47
107
|
});
|
48
108
|
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
mceItemRealMedia : 'realmedia'
|
56
|
-
};
|
109
|
+
scriptRegExp = new RegExp('write(' + scriptRegExp + ')\\(([^)]+)\\)');
|
110
|
+
self.lookup = lookup;
|
111
|
+
|
112
|
+
ed.onPreInit.add(function() {
|
113
|
+
// Allow video elements
|
114
|
+
ed.schema.addValidElements('object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]');
|
57
115
|
|
58
|
-
|
59
|
-
|
116
|
+
// Convert video elements to image placeholder
|
117
|
+
ed.parser.addNodeFilter('object,embed,video,audio,script,iframe', function(nodes) {
|
118
|
+
var i = nodes.length;
|
119
|
+
|
120
|
+
while (i--)
|
121
|
+
self.objectToImg(nodes[i]);
|
60
122
|
});
|
61
123
|
|
62
|
-
|
124
|
+
// Convert image placeholders to video elements
|
125
|
+
ed.serializer.addNodeFilter('img', function(nodes, name, args) {
|
126
|
+
var i = nodes.length, node;
|
63
127
|
|
64
|
-
|
65
|
-
|
128
|
+
while (i--) {
|
129
|
+
node = nodes[i];
|
130
|
+
if ((node.attr('class') || '').indexOf('mceItemMedia') !== -1)
|
131
|
+
self.imgToObject(node, args);
|
132
|
+
}
|
133
|
+
});
|
134
|
+
});
|
66
135
|
|
136
|
+
ed.onInit.add(function() {
|
137
|
+
// Display "media" instead of "img" in element path
|
67
138
|
if (ed.theme && ed.theme.onResolveName) {
|
68
|
-
ed.theme.onResolveName.add(function(
|
69
|
-
if (
|
70
|
-
|
71
|
-
if (ed.dom.hasClass(o.node, k)) {
|
72
|
-
o.name = v;
|
73
|
-
o.title = ed.dom.getAttrib(o.node, 'title');
|
74
|
-
return false;
|
75
|
-
}
|
76
|
-
});
|
77
|
-
}
|
139
|
+
ed.theme.onResolveName.add(function(theme, path_object) {
|
140
|
+
if (path_object.name === 'img' && ed.dom.hasClass(path_object.node, 'mceItemMedia'))
|
141
|
+
path_object.name = 'media';
|
78
142
|
});
|
79
143
|
}
|
80
144
|
|
145
|
+
// Add contect menu if it's loaded
|
81
146
|
if (ed && ed.plugins.contextmenu) {
|
82
|
-
ed.plugins.contextmenu.onContextMenu.add(function(
|
83
|
-
if (
|
84
|
-
|
85
|
-
}
|
147
|
+
ed.plugins.contextmenu.onContextMenu.add(function(plugin, menu, element) {
|
148
|
+
if (element.nodeName === 'IMG' && element.className.indexOf('mceItemMedia') !== -1)
|
149
|
+
menu.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
|
86
150
|
});
|
87
151
|
}
|
88
152
|
});
|
89
153
|
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
t._spansToImgs(ed.getBody());
|
94
|
-
});
|
154
|
+
// Register commands
|
155
|
+
ed.addCommand('mceMedia', function() {
|
156
|
+
var data, img;
|
95
157
|
|
96
|
-
|
97
|
-
|
158
|
+
img = ed.selection.getNode();
|
159
|
+
if (isMediaImg(img)) {
|
160
|
+
data = ed.dom.getAttrib(img, 'data-mce-json');
|
161
|
+
if (data) {
|
162
|
+
data = JSON.parse(data);
|
98
163
|
|
99
|
-
|
100
|
-
|
164
|
+
// Add some extra properties to the data object
|
165
|
+
tinymce.each(rootAttributes, function(name) {
|
166
|
+
var value = ed.dom.getAttrib(img, name);
|
101
167
|
|
102
|
-
|
103
|
-
|
168
|
+
if (value)
|
169
|
+
data[name] = value;
|
170
|
+
});
|
104
171
|
|
105
|
-
|
106
|
-
|
107
|
-
dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));
|
108
|
-
dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));
|
109
|
-
}
|
110
|
-
});
|
172
|
+
data.type = self.getType(img.className).name.toLowerCase();
|
173
|
+
}
|
111
174
|
}
|
112
175
|
|
113
|
-
if (
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
n.className = n.className.replace(/mceItem/g, 'mceTemp');
|
120
|
-
|
121
|
-
return;
|
122
|
-
}
|
123
|
-
|
124
|
-
switch (n.className) {
|
125
|
-
case 'mceItemFlash':
|
126
|
-
ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';
|
127
|
-
cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
|
128
|
-
mt = 'application/x-shockwave-flash';
|
129
|
-
break;
|
130
|
-
|
131
|
-
case 'mceItemShockWave':
|
132
|
-
ci = '166b1bca-3f9c-11cf-8075-444553540000';
|
133
|
-
cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
|
134
|
-
mt = 'application/x-director';
|
135
|
-
break;
|
136
|
-
|
137
|
-
case 'mceItemWindowsMedia':
|
138
|
-
ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';
|
139
|
-
cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
|
140
|
-
mt = 'application/x-mplayer2';
|
141
|
-
break;
|
142
|
-
|
143
|
-
case 'mceItemQuickTime':
|
144
|
-
ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';
|
145
|
-
cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
|
146
|
-
mt = 'video/quicktime';
|
147
|
-
break;
|
148
|
-
|
149
|
-
case 'mceItemRealMedia':
|
150
|
-
ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';
|
151
|
-
cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
|
152
|
-
mt = 'audio/x-pn-realaudio-plugin';
|
153
|
-
break;
|
154
|
-
}
|
155
|
-
|
156
|
-
if (ci) {
|
157
|
-
dom.replace(t._buildObj({
|
158
|
-
classid : ci,
|
159
|
-
codebase : cb,
|
160
|
-
type : mt
|
161
|
-
}, n), n);
|
162
|
-
}
|
163
|
-
});
|
176
|
+
if (!data) {
|
177
|
+
data = {
|
178
|
+
type : 'flash',
|
179
|
+
video: {sources:[]},
|
180
|
+
params: {}
|
181
|
+
};
|
164
182
|
}
|
165
|
-
});
|
166
183
|
|
167
|
-
|
168
|
-
|
184
|
+
ed.windowManager.open({
|
185
|
+
file : url + '/media.htm',
|
186
|
+
width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
|
187
|
+
height : 500 + parseInt(ed.getLang('media.delta_height', 0)),
|
188
|
+
inline : 1
|
189
|
+
}, {
|
190
|
+
plugin_url : url,
|
191
|
+
data : data
|
192
|
+
});
|
169
193
|
});
|
170
194
|
|
171
|
-
|
172
|
-
|
195
|
+
// Register buttons
|
196
|
+
ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
|
173
197
|
|
174
|
-
|
175
|
-
|
198
|
+
// Update media selection status
|
199
|
+
ed.onNodeChange.add(function(ed, cm, node) {
|
200
|
+
cm.setActive('media', isMediaImg(node));
|
201
|
+
});
|
202
|
+
},
|
176
203
|
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
204
|
+
convertUrl : function(url, force_absolute) {
|
205
|
+
var self = this, editor = self.editor, settings = editor.settings,
|
206
|
+
urlConverter = settings.url_converter,
|
207
|
+
urlConverterScope = settings.url_converter_scope || self;
|
181
208
|
|
182
|
-
|
183
|
-
|
184
|
-
at.width = getAttr(im, 'width');
|
185
|
-
at.height = getAttr(im, 'height');
|
186
|
-
im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';
|
187
|
-
}
|
209
|
+
if (!url)
|
210
|
+
return url;
|
188
211
|
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
212
|
+
if (force_absolute)
|
213
|
+
return editor.documentBaseURI.toAbsolute(url);
|
214
|
+
|
215
|
+
return urlConverter.call(urlConverterScope, url, 'src', 'object');
|
193
216
|
},
|
194
217
|
|
195
218
|
getInfo : function() {
|
@@ -202,210 +225,595 @@
|
|
202
225
|
};
|
203
226
|
},
|
204
227
|
|
205
|
-
|
206
|
-
|
207
|
-
|
228
|
+
/**
|
229
|
+
* Converts the JSON data object to an img node.
|
230
|
+
*/
|
231
|
+
dataToImg : function(data, force_absolute) {
|
232
|
+
var self = this, editor = self.editor, baseUri = editor.documentBaseURI, sources, attrs, img, i;
|
233
|
+
|
234
|
+
data.params.src = self.convertUrl(data.params.src, force_absolute);
|
208
235
|
|
209
|
-
|
210
|
-
|
236
|
+
attrs = data.video.attrs;
|
237
|
+
if (attrs)
|
238
|
+
attrs.src = self.convertUrl(attrs.src, force_absolute);
|
239
|
+
|
240
|
+
if (attrs)
|
241
|
+
attrs.poster = self.convertUrl(attrs.poster, force_absolute);
|
242
|
+
|
243
|
+
sources = toArray(data.video.sources);
|
244
|
+
if (sources) {
|
245
|
+
for (i = 0; i < sources.length; i++)
|
246
|
+
sources[i].src = self.convertUrl(sources[i].src, force_absolute);
|
247
|
+
}
|
211
248
|
|
212
|
-
|
249
|
+
img = self.editor.dom.create('img', {
|
250
|
+
id : data.id,
|
251
|
+
style : data.style,
|
252
|
+
align : data.align,
|
253
|
+
src : self.editor.theme.url + '/img/trans.gif',
|
254
|
+
'class' : 'mceItemMedia mceItem' + self.getType(data.type).name,
|
255
|
+
'data-mce-json' : JSON.serialize(data, "'")
|
213
256
|
});
|
214
257
|
|
215
|
-
|
216
|
-
|
217
|
-
h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
|
218
|
-
h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');
|
219
|
-
h = h.replace(/<\/embed>/gi, '');
|
220
|
-
h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_mce_value=') + ' class="mceItemParam"></span>'});
|
221
|
-
h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
|
258
|
+
img.width = data.width || (data.type == 'audio' ? "300" : "320");
|
259
|
+
img.height = data.height || (data.type == 'audio' ? "32" : "240");
|
222
260
|
|
223
|
-
|
261
|
+
return img;
|
224
262
|
},
|
225
263
|
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
264
|
+
/**
|
265
|
+
* Converts the JSON data object to a HTML string.
|
266
|
+
*/
|
267
|
+
dataToHtml : function(data, force_absolute) {
|
268
|
+
return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {forced_root_block : '', force_absolute : force_absolute});
|
269
|
+
},
|
270
|
+
|
271
|
+
/**
|
272
|
+
* Converts the JSON data object to a HTML string.
|
273
|
+
*/
|
274
|
+
htmlToData : function(html) {
|
275
|
+
var fragment, img, data;
|
276
|
+
|
277
|
+
data = {
|
278
|
+
type : 'flash',
|
279
|
+
video: {sources:[]},
|
280
|
+
params: {}
|
281
|
+
};
|
282
|
+
|
283
|
+
fragment = this.editor.parser.parse(html);
|
284
|
+
img = fragment.getAll('img')[0];
|
285
|
+
|
286
|
+
if (img) {
|
287
|
+
data = JSON.parse(img.attr('data-mce-json'));
|
288
|
+
data.type = this.getType(img.attr('class')).name.toLowerCase();
|
289
|
+
|
290
|
+
// Add some extra properties to the data object
|
291
|
+
tinymce.each(rootAttributes, function(name) {
|
292
|
+
var value = img.attr(name);
|
293
|
+
|
294
|
+
if (value)
|
295
|
+
data[name] = value;
|
296
|
+
});
|
297
|
+
}
|
298
|
+
|
299
|
+
return data;
|
300
|
+
},
|
301
|
+
|
302
|
+
/**
|
303
|
+
* Get type item by extension, class, clsid or mime type.
|
304
|
+
*
|
305
|
+
* @method getType
|
306
|
+
* @param {String} value Value to get type item by.
|
307
|
+
* @return {Object} Type item object or undefined.
|
308
|
+
*/
|
309
|
+
getType : function(value) {
|
310
|
+
var i, values, typeItem;
|
311
|
+
|
312
|
+
// Find type by checking the classes
|
313
|
+
values = tinymce.explode(value, ' ');
|
314
|
+
for (i = 0; i < values.length; i++) {
|
315
|
+
typeItem = this.lookup[values[i]];
|
316
|
+
|
317
|
+
if (typeItem)
|
318
|
+
return typeItem;
|
319
|
+
}
|
320
|
+
},
|
321
|
+
|
322
|
+
/**
|
323
|
+
* Converts a tinymce.html.Node image element to video/object/embed.
|
324
|
+
*/
|
325
|
+
imgToObject : function(node, args) {
|
326
|
+
var self = this, editor = self.editor, video, object, embed, iframe, name, value, data,
|
327
|
+
source, sources, params, param, typeItem, i, item, mp4Source, replacement,
|
328
|
+
posterSrc, style, audio;
|
329
|
+
|
330
|
+
// Adds the flash player
|
331
|
+
function addPlayer(video_src, poster_src) {
|
332
|
+
var baseUri, flashVars, flashVarsOutput, params, flashPlayer;
|
333
|
+
|
334
|
+
flashPlayer = editor.getParam('flash_video_player_url', self.convertUrl(self.url + '/moxieplayer.swf'));
|
335
|
+
if (flashPlayer) {
|
336
|
+
baseUri = editor.documentBaseURI;
|
337
|
+
data.params.src = flashPlayer;
|
338
|
+
|
339
|
+
// Convert the movie url to absolute urls
|
340
|
+
if (editor.getParam('flash_video_player_absvideourl', true)) {
|
341
|
+
video_src = baseUri.toAbsolute(video_src || '', true);
|
342
|
+
poster_src = baseUri.toAbsolute(poster_src || '', true);
|
343
|
+
}
|
344
|
+
|
345
|
+
// Generate flash vars
|
346
|
+
flashVarsOutput = '';
|
347
|
+
flashVars = editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'});
|
348
|
+
tinymce.each(flashVars, function(value, name) {
|
349
|
+
// Replace $url and $poster variables in flashvars value
|
350
|
+
value = value.replace(/\$url/, video_src || '');
|
351
|
+
value = value.replace(/\$poster/, poster_src || '');
|
352
|
+
|
353
|
+
if (value.length > 0)
|
354
|
+
flashVarsOutput += (flashVarsOutput ? '&' : '') + name + '=' + escape(value);
|
355
|
+
});
|
356
|
+
|
357
|
+
if (flashVarsOutput.length)
|
358
|
+
data.params.flashvars = flashVarsOutput;
|
359
|
+
|
360
|
+
params = editor.getParam('flash_video_player_params', {
|
361
|
+
allowfullscreen: true,
|
362
|
+
allowscriptaccess: true
|
363
|
+
});
|
364
|
+
|
365
|
+
tinymce.each(params, function(value, name) {
|
366
|
+
data.params[name] = "" + value;
|
367
|
+
});
|
368
|
+
}
|
369
|
+
};
|
370
|
+
|
371
|
+
data = node.attr('data-mce-json');
|
372
|
+
if (!data)
|
373
|
+
return;
|
374
|
+
|
375
|
+
data = JSON.parse(data);
|
376
|
+
typeItem = this.getType(node.attr('class'));
|
377
|
+
|
378
|
+
style = node.attr('data-mce-style')
|
379
|
+
if (!style) {
|
380
|
+
style = node.attr('style');
|
381
|
+
|
382
|
+
if (style)
|
383
|
+
style = editor.dom.serializeStyle(editor.dom.parseStyle(style, 'img'));
|
384
|
+
}
|
385
|
+
|
386
|
+
// Handle iframe
|
387
|
+
if (typeItem.name === 'Iframe') {
|
388
|
+
replacement = new Node('iframe', 1);
|
389
|
+
|
390
|
+
tinymce.each(rootAttributes, function(name) {
|
391
|
+
var value = node.attr(name);
|
392
|
+
|
393
|
+
if (name == 'class' && value)
|
394
|
+
value = value.replace(/mceItem.+ ?/g, '');
|
395
|
+
|
396
|
+
if (value && value.length > 0)
|
397
|
+
replacement.attr(name, value);
|
246
398
|
});
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
style
|
253
|
-
|
254
|
-
width : o.width,
|
255
|
-
height : o.height
|
399
|
+
|
400
|
+
for (name in data.params)
|
401
|
+
replacement.attr(name, data.params[name]);
|
402
|
+
|
403
|
+
replacement.attr({
|
404
|
+
style: style,
|
405
|
+
src: data.params.src
|
256
406
|
});
|
407
|
+
|
408
|
+
node.replace(replacement);
|
409
|
+
|
410
|
+
return;
|
257
411
|
}
|
258
412
|
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url)
|
263
|
-
k = 'url';
|
413
|
+
// Handle scripts
|
414
|
+
if (this.editor.settings.media_use_script) {
|
415
|
+
replacement = new Node('script', 1).attr('type', 'text/javascript');
|
264
416
|
|
265
|
-
|
266
|
-
|
417
|
+
value = new Node('#text', 3);
|
418
|
+
value.value = 'write' + typeItem.name + '(' + JSON.serialize(tinymce.extend(data.params, {
|
419
|
+
width: node.attr('width'),
|
420
|
+
height: node.attr('height')
|
421
|
+
})) + ');';
|
422
|
+
|
423
|
+
replacement.append(value);
|
424
|
+
node.replace(replacement);
|
425
|
+
|
426
|
+
return;
|
427
|
+
}
|
428
|
+
|
429
|
+
// Add HTML5 video element
|
430
|
+
if (typeItem.name === 'Video' && data.video.sources[0]) {
|
431
|
+
// Create new object element
|
432
|
+
video = new Node('video', 1).attr(tinymce.extend({
|
433
|
+
id : node.attr('id'),
|
434
|
+
width: node.attr('width'),
|
435
|
+
height: node.attr('height'),
|
436
|
+
style : style
|
437
|
+
}, data.video.attrs));
|
438
|
+
|
439
|
+
// Get poster source and use that for flash fallback
|
440
|
+
if (data.video.attrs)
|
441
|
+
posterSrc = data.video.attrs.poster;
|
442
|
+
|
443
|
+
sources = data.video.sources = toArray(data.video.sources);
|
444
|
+
for (i = 0; i < sources.length; i++) {
|
445
|
+
if (/\.mp4$/.test(sources[i].src))
|
446
|
+
mp4Source = sources[i].src;
|
267
447
|
}
|
268
|
-
});
|
269
448
|
|
270
|
-
|
271
|
-
|
449
|
+
if (!sources[0].type) {
|
450
|
+
video.attr('src', sources[0].src);
|
451
|
+
sources.splice(0, 1);
|
452
|
+
}
|
272
453
|
|
273
|
-
|
274
|
-
|
454
|
+
for (i = 0; i < sources.length; i++) {
|
455
|
+
source = new Node('source', 1).attr(sources[i]);
|
456
|
+
source.shortEnded = true;
|
457
|
+
video.append(source);
|
458
|
+
}
|
275
459
|
|
276
|
-
|
277
|
-
|
460
|
+
// Create flash fallback for video if we have a mp4 source
|
461
|
+
if (mp4Source) {
|
462
|
+
addPlayer(mp4Source, posterSrc);
|
463
|
+
typeItem = self.getType('flash');
|
464
|
+
} else
|
465
|
+
data.params.src = '';
|
466
|
+
}
|
278
467
|
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
468
|
+
// Add HTML5 audio element
|
469
|
+
if (typeItem.name === 'Audio' && data.video.sources[0]) {
|
470
|
+
// Create new object element
|
471
|
+
audio = new Node('audio', 1).attr(tinymce.extend({
|
472
|
+
id : node.attr('id'),
|
473
|
+
width: node.attr('width'),
|
474
|
+
height: node.attr('height'),
|
475
|
+
style : style
|
476
|
+
}, data.video.attrs));
|
477
|
+
|
478
|
+
// Get poster source and use that for flash fallback
|
479
|
+
if (data.video.attrs)
|
480
|
+
posterSrc = data.video.attrs.poster;
|
481
|
+
|
482
|
+
sources = data.video.sources = toArray(data.video.sources);
|
483
|
+
if (!sources[0].type) {
|
484
|
+
audio.attr('src', sources[0].src);
|
485
|
+
sources.splice(0, 1);
|
486
|
+
}
|
283
487
|
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
488
|
+
for (i = 0; i < sources.length; i++) {
|
489
|
+
source = new Node('source', 1).attr(sources[i]);
|
490
|
+
source.shortEnded = true;
|
491
|
+
audio.append(source);
|
492
|
+
}
|
288
493
|
|
289
|
-
|
290
|
-
|
291
|
-
break;
|
494
|
+
data.params.src = '';
|
495
|
+
}
|
292
496
|
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
497
|
+
// Do we have a params src then we can generate object
|
498
|
+
if (data.params.src) {
|
499
|
+
// Is flv movie add player for it
|
500
|
+
if (/\.flv$/i.test(data.params.src))
|
501
|
+
addPlayer(data.params.src, '');
|
502
|
+
|
503
|
+
if (args && args.force_absolute)
|
504
|
+
data.params.src = editor.documentBaseURI.toAbsolute(data.params.src);
|
505
|
+
|
506
|
+
// Create new object element
|
507
|
+
object = new Node('object', 1).attr({
|
508
|
+
id : node.attr('id'),
|
509
|
+
width: node.attr('width'),
|
510
|
+
height: node.attr('height'),
|
511
|
+
style : style
|
512
|
+
});
|
298
513
|
|
299
|
-
|
300
|
-
|
301
|
-
|
514
|
+
tinymce.each(rootAttributes, function(name) {
|
515
|
+
if (data[name] && name != 'type')
|
516
|
+
object.attr(name, data[name]);
|
517
|
+
});
|
302
518
|
|
303
|
-
|
304
|
-
|
305
|
-
|
519
|
+
// Add params
|
520
|
+
for (name in data.params) {
|
521
|
+
param = new Node('param', 1);
|
522
|
+
param.shortEnded = true;
|
523
|
+
value = data.params[name];
|
306
524
|
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
525
|
+
// Windows media needs to use url instead of src for the media URL
|
526
|
+
if (name === 'src' && typeItem.name === 'WindowsMedia')
|
527
|
+
name = 'url';
|
528
|
+
|
529
|
+
param.attr({name: name, value: value});
|
530
|
+
object.append(param);
|
312
531
|
}
|
313
532
|
|
314
|
-
//
|
315
|
-
if (
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
533
|
+
// Setup add type and classid if strict is disabled
|
534
|
+
if (this.editor.getParam('media_strict', true)) {
|
535
|
+
object.attr({
|
536
|
+
data: data.params.src,
|
537
|
+
type: typeItem.mimes[0]
|
538
|
+
});
|
539
|
+
} else {
|
540
|
+
object.attr({
|
541
|
+
classid: "clsid:" + typeItem.clsids[0],
|
542
|
+
codebase: typeItem.codebase
|
543
|
+
});
|
320
544
|
|
321
|
-
|
322
|
-
|
323
|
-
|
545
|
+
embed = new Node('embed', 1);
|
546
|
+
embed.shortEnded = true;
|
547
|
+
embed.attr({
|
548
|
+
id: node.attr('id'),
|
549
|
+
width: node.attr('width'),
|
550
|
+
height: node.attr('height'),
|
551
|
+
style : style,
|
552
|
+
type: typeItem.mimes[0]
|
553
|
+
});
|
324
554
|
|
325
|
-
|
326
|
-
|
327
|
-
break;
|
555
|
+
for (name in data.params)
|
556
|
+
embed.attr(name, data.params[name]);
|
328
557
|
|
329
|
-
|
330
|
-
|
331
|
-
|
558
|
+
tinymce.each(rootAttributes, function(name) {
|
559
|
+
if (data[name] && name != 'type')
|
560
|
+
embed.attr(name, data[name]);
|
561
|
+
});
|
332
562
|
|
333
|
-
|
334
|
-
|
335
|
-
break;
|
563
|
+
object.append(embed);
|
564
|
+
}
|
336
565
|
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
566
|
+
// Insert raw HTML
|
567
|
+
if (data.object_html) {
|
568
|
+
value = new Node('#text', 3);
|
569
|
+
value.raw = true;
|
570
|
+
value.value = data.object_html;
|
571
|
+
object.append(value);
|
572
|
+
}
|
573
|
+
|
574
|
+
// Append object to video element if it exists
|
575
|
+
if (video)
|
576
|
+
video.append(object);
|
577
|
+
}
|
578
|
+
|
579
|
+
if (video) {
|
580
|
+
// Insert raw HTML
|
581
|
+
if (data.video_html) {
|
582
|
+
value = new Node('#text', 3);
|
583
|
+
value.raw = true;
|
584
|
+
value.value = data.video_html;
|
585
|
+
video.append(value);
|
586
|
+
}
|
587
|
+
}
|
588
|
+
|
589
|
+
if (audio) {
|
590
|
+
// Insert raw HTML
|
591
|
+
if (data.video_html) {
|
592
|
+
value = new Node('#text', 3);
|
593
|
+
value.raw = true;
|
594
|
+
value.value = data.video_html;
|
595
|
+
audio.append(value);
|
596
|
+
}
|
597
|
+
}
|
598
|
+
|
599
|
+
if (video || audio || object)
|
600
|
+
node.replace(video || audio || object);
|
601
|
+
else
|
602
|
+
node.remove();
|
342
603
|
},
|
343
604
|
|
344
|
-
|
345
|
-
|
605
|
+
/**
|
606
|
+
* Converts a tinymce.html.Node video/object/embed to an img element.
|
607
|
+
*
|
608
|
+
* The video/object/embed will be converted into an image placeholder with a JSON data attribute like this:
|
609
|
+
* <img class="mceItemMedia mceItemFlash" width="100" height="100" data-mce-json="{..}" />
|
610
|
+
*
|
611
|
+
* The JSON structure will be like this:
|
612
|
+
* {'params':{'flashvars':'something','quality':'high','src':'someurl'}, 'video':{'sources':[{src: 'someurl', type: 'video/mp4'}]}}
|
613
|
+
*/
|
614
|
+
objectToImg : function(node) {
|
615
|
+
var object, embed, video, iframe, img, name, id, width, height, style, i, html,
|
616
|
+
param, params, source, sources, data, type, lookup = this.lookup,
|
617
|
+
matches, attrs, urlConverter = this.editor.settings.url_converter,
|
618
|
+
urlConverterScope = this.editor.settings.url_converter_scope;
|
619
|
+
|
620
|
+
function getInnerHTML(node) {
|
621
|
+
return new tinymce.html.Serializer({
|
622
|
+
inner: true,
|
623
|
+
validate: false
|
624
|
+
}).serialize(node);
|
625
|
+
};
|
346
626
|
|
347
|
-
|
627
|
+
// If node isn't in document
|
628
|
+
if (!node.parent)
|
629
|
+
return;
|
348
630
|
|
349
|
-
//
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
height : dom.getAttrib(n, 'height') || 100,
|
354
|
-
style : dom.getAttrib(n, 'style'),
|
355
|
-
'class' : cl
|
356
|
-
});
|
631
|
+
// Handle media scripts
|
632
|
+
if (node.name === 'script') {
|
633
|
+
if (node.firstChild)
|
634
|
+
matches = scriptRegExp.exec(node.firstChild.value);
|
357
635
|
|
358
|
-
|
359
|
-
|
360
|
-
var v = dom.getAttrib(n, na);
|
636
|
+
if (!matches)
|
637
|
+
return;
|
361
638
|
|
362
|
-
|
363
|
-
|
364
|
-
|
639
|
+
type = matches[1];
|
640
|
+
data = {video : {}, params : JSON.parse(matches[2])};
|
641
|
+
width = data.params.width;
|
642
|
+
height = data.params.height;
|
643
|
+
}
|
644
|
+
|
645
|
+
// Setup data objects
|
646
|
+
data = data || {
|
647
|
+
video : {},
|
648
|
+
params : {}
|
649
|
+
};
|
365
650
|
|
366
|
-
//
|
367
|
-
|
368
|
-
|
369
|
-
|
651
|
+
// Setup new image object
|
652
|
+
img = new Node('img', 1);
|
653
|
+
img.attr({
|
654
|
+
src : this.editor.theme.url + '/img/trans.gif'
|
370
655
|
});
|
371
656
|
|
372
|
-
//
|
373
|
-
|
374
|
-
|
375
|
-
|
657
|
+
// Video element
|
658
|
+
name = node.name;
|
659
|
+
if (name === 'video' || name == 'audio') {
|
660
|
+
video = node;
|
661
|
+
object = node.getAll('object')[0];
|
662
|
+
embed = node.getAll('embed')[0];
|
663
|
+
width = video.attr('width');
|
664
|
+
height = video.attr('height');
|
665
|
+
id = video.attr('id');
|
666
|
+
data.video = {attrs : {}, sources : []};
|
667
|
+
|
668
|
+
// Get all video attributes
|
669
|
+
attrs = data.video.attrs;
|
670
|
+
for (name in video.attributes.map)
|
671
|
+
attrs[name] = video.attributes.map[name];
|
672
|
+
|
673
|
+
source = node.attr('src');
|
674
|
+
if (source)
|
675
|
+
data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', node.name)});
|
676
|
+
|
677
|
+
// Get all sources
|
678
|
+
sources = video.getAll("source");
|
679
|
+
for (i = 0; i < sources.length; i++) {
|
680
|
+
source = sources[i].remove();
|
681
|
+
|
682
|
+
data.video.sources.push({
|
683
|
+
src: urlConverter.call(urlConverterScope, source.attr('src'), 'src', 'source'),
|
684
|
+
type: source.attr('type'),
|
685
|
+
media: source.attr('media')
|
686
|
+
});
|
687
|
+
}
|
688
|
+
|
689
|
+
// Convert the poster URL
|
690
|
+
if (attrs.poster)
|
691
|
+
attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', node.name);
|
376
692
|
}
|
377
693
|
|
378
|
-
//
|
379
|
-
if (
|
380
|
-
|
381
|
-
|
694
|
+
// Object element
|
695
|
+
if (node.name === 'object') {
|
696
|
+
object = node;
|
697
|
+
embed = node.getAll('embed')[0];
|
382
698
|
}
|
383
699
|
|
384
|
-
//
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
700
|
+
// Embed element
|
701
|
+
if (node.name === 'embed')
|
702
|
+
embed = node;
|
703
|
+
|
704
|
+
// Iframe element
|
705
|
+
if (node.name === 'iframe') {
|
706
|
+
iframe = node;
|
707
|
+
type = 'Iframe';
|
708
|
+
}
|
709
|
+
|
710
|
+
if (object) {
|
711
|
+
// Get width/height
|
712
|
+
width = width || object.attr('width');
|
713
|
+
height = height || object.attr('height');
|
714
|
+
style = style || object.attr('style');
|
715
|
+
id = id || object.attr('id');
|
716
|
+
|
717
|
+
// Get all object params
|
718
|
+
params = object.getAll("param");
|
719
|
+
for (i = 0; i < params.length; i++) {
|
720
|
+
param = params[i];
|
721
|
+
name = param.remove().attr('name');
|
722
|
+
|
723
|
+
if (!excludedAttrs[name])
|
724
|
+
data.params[name] = param.attr('value');
|
725
|
+
}
|
726
|
+
|
727
|
+
data.params.src = data.params.src || object.attr('data');
|
728
|
+
}
|
389
729
|
|
390
|
-
|
391
|
-
|
730
|
+
if (embed) {
|
731
|
+
// Get width/height
|
732
|
+
width = width || embed.attr('width');
|
733
|
+
height = height || embed.attr('height');
|
734
|
+
style = style || embed.attr('style');
|
735
|
+
id = id || embed.attr('id');
|
736
|
+
|
737
|
+
// Get all embed attributes
|
738
|
+
for (name in embed.attributes.map) {
|
739
|
+
if (!excludedAttrs[name] && !data.params[name])
|
740
|
+
data.params[name] = embed.attributes.map[name];
|
741
|
+
}
|
742
|
+
}
|
743
|
+
|
744
|
+
if (iframe) {
|
745
|
+
// Get width/height
|
746
|
+
width = iframe.attr('width');
|
747
|
+
height = iframe.attr('height');
|
748
|
+
style = style || iframe.attr('style');
|
749
|
+
id = iframe.attr('id');
|
750
|
+
|
751
|
+
tinymce.each(rootAttributes, function(name) {
|
752
|
+
img.attr(name, iframe.attr(name));
|
392
753
|
});
|
754
|
+
|
755
|
+
// Get all iframe attributes
|
756
|
+
for (name in iframe.attributes.map) {
|
757
|
+
if (!excludedAttrs[name] && !data.params[name])
|
758
|
+
data.params[name] = iframe.attributes.map[name];
|
759
|
+
}
|
393
760
|
}
|
394
761
|
|
395
|
-
|
396
|
-
|
762
|
+
// Use src not movie
|
763
|
+
if (data.params.movie) {
|
764
|
+
data.params.src = data.params.src || data.params.movie;
|
765
|
+
delete data.params.movie;
|
766
|
+
}
|
397
767
|
|
398
|
-
|
768
|
+
// Convert the URL to relative/absolute depending on configuration
|
769
|
+
if (data.params.src)
|
770
|
+
data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');
|
399
771
|
|
400
|
-
|
401
|
-
|
772
|
+
if (video) {
|
773
|
+
if (node.name === 'video')
|
774
|
+
type = lookup.video.name;
|
775
|
+
else if (node.name === 'audio')
|
776
|
+
type = lookup.audio.name;
|
777
|
+
}
|
402
778
|
|
403
|
-
|
404
|
-
|
405
|
-
},
|
779
|
+
if (object && !type)
|
780
|
+
type = (lookup[(object.attr('clsid') || '').toLowerCase()] || lookup[(object.attr('type') || '').toLowerCase()] || {}).name;
|
406
781
|
|
407
|
-
|
408
|
-
|
782
|
+
if (embed && !type)
|
783
|
+
type = (lookup[(embed.attr('type') || '').toLowerCase()] || {}).name;
|
784
|
+
|
785
|
+
// Replace the video/object/embed element with a placeholder image containing the data
|
786
|
+
node.replace(img);
|
787
|
+
|
788
|
+
// Remove embed
|
789
|
+
if (embed)
|
790
|
+
embed.remove();
|
791
|
+
|
792
|
+
// Serialize the inner HTML of the object element
|
793
|
+
if (object) {
|
794
|
+
html = getInnerHTML(object.remove());
|
795
|
+
|
796
|
+
if (html)
|
797
|
+
data.object_html = html;
|
798
|
+
}
|
799
|
+
|
800
|
+
// Serialize the inner HTML of the video element
|
801
|
+
if (video) {
|
802
|
+
html = getInnerHTML(video.remove());
|
803
|
+
|
804
|
+
if (html)
|
805
|
+
data.video_html = html;
|
806
|
+
}
|
807
|
+
|
808
|
+
// Set width/height of placeholder
|
809
|
+
img.attr({
|
810
|
+
id : id,
|
811
|
+
'class' : 'mceItemMedia mceItem' + (type || 'Flash'),
|
812
|
+
style : style,
|
813
|
+
width : width || (node.name == 'audio' ? "300" : "320"),
|
814
|
+
height : height || (node.name == 'audio' ? "32" : "240"),
|
815
|
+
"data-mce-json" : JSON.serialize(data, "'")
|
816
|
+
});
|
409
817
|
}
|
410
818
|
});
|
411
819
|
|