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,630 +1,389 @@
|
|
1
|
-
|
1
|
+
(function() {
|
2
|
+
var url;
|
2
3
|
|
3
|
-
|
4
|
+
if (url = tinyMCEPopup.getParam("media_external_list_url"))
|
5
|
+
document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
|
4
6
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
function init() {
|
9
|
-
var pl = "", f, val;
|
10
|
-
var type = "flash", fe, i;
|
11
|
-
|
12
|
-
ed = tinyMCEPopup.editor;
|
13
|
-
|
14
|
-
tinyMCEPopup.resizeToInnerSize();
|
15
|
-
f = document.forms[0]
|
16
|
-
|
17
|
-
fe = ed.selection.getNode();
|
18
|
-
if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
|
19
|
-
pl = fe.title;
|
20
|
-
|
21
|
-
switch (ed.dom.getAttrib(fe, 'class')) {
|
22
|
-
case 'mceItemFlash':
|
23
|
-
type = 'flash';
|
24
|
-
break;
|
25
|
-
|
26
|
-
case 'mceItemFlashVideo':
|
27
|
-
type = 'flv';
|
28
|
-
break;
|
29
|
-
|
30
|
-
case 'mceItemShockWave':
|
31
|
-
type = 'shockwave';
|
32
|
-
break;
|
33
|
-
|
34
|
-
case 'mceItemWindowsMedia':
|
35
|
-
type = 'wmp';
|
36
|
-
break;
|
37
|
-
|
38
|
-
case 'mceItemQuickTime':
|
39
|
-
type = 'qt';
|
40
|
-
break;
|
41
|
-
|
42
|
-
case 'mceItemRealMedia':
|
43
|
-
type = 'rmp';
|
44
|
-
break;
|
45
|
-
}
|
46
|
-
|
47
|
-
document.forms[0].insert.value = ed.getLang('update', 'Insert', true);
|
7
|
+
function get(id) {
|
8
|
+
return document.getElementById(id);
|
48
9
|
}
|
49
10
|
|
50
|
-
|
51
|
-
|
52
|
-
document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
|
53
|
-
|
54
|
-
var html = getMediaListHTML('medialist','src','media','media');
|
55
|
-
if (html == "")
|
56
|
-
document.getElementById("linklistrow").style.display = 'none';
|
57
|
-
else
|
58
|
-
document.getElementById("linklistcontainer").innerHTML = html;
|
59
|
-
|
60
|
-
// Resize some elements
|
61
|
-
if (isVisible('filebrowser'))
|
62
|
-
document.getElementById('src').style.width = '230px';
|
63
|
-
|
64
|
-
// Setup form
|
65
|
-
if (pl != "") {
|
66
|
-
pl = tinyMCEPopup.editor.plugins.media._parse(pl);
|
67
|
-
|
68
|
-
switch (type) {
|
69
|
-
case "flash":
|
70
|
-
setBool(pl, 'flash', 'play');
|
71
|
-
setBool(pl, 'flash', 'loop');
|
72
|
-
setBool(pl, 'flash', 'menu');
|
73
|
-
setBool(pl, 'flash', 'swliveconnect');
|
74
|
-
setStr(pl, 'flash', 'quality');
|
75
|
-
setStr(pl, 'flash', 'scale');
|
76
|
-
setStr(pl, 'flash', 'salign');
|
77
|
-
setStr(pl, 'flash', 'wmode');
|
78
|
-
setStr(pl, 'flash', 'base');
|
79
|
-
setStr(pl, 'flash', 'flashvars');
|
80
|
-
break;
|
81
|
-
|
82
|
-
case "qt":
|
83
|
-
setBool(pl, 'qt', 'loop');
|
84
|
-
setBool(pl, 'qt', 'autoplay');
|
85
|
-
setBool(pl, 'qt', 'cache');
|
86
|
-
setBool(pl, 'qt', 'controller');
|
87
|
-
setBool(pl, 'qt', 'correction');
|
88
|
-
setBool(pl, 'qt', 'enablejavascript');
|
89
|
-
setBool(pl, 'qt', 'kioskmode');
|
90
|
-
setBool(pl, 'qt', 'autohref');
|
91
|
-
setBool(pl, 'qt', 'playeveryframe');
|
92
|
-
setBool(pl, 'qt', 'tarsetcache');
|
93
|
-
setStr(pl, 'qt', 'scale');
|
94
|
-
setStr(pl, 'qt', 'starttime');
|
95
|
-
setStr(pl, 'qt', 'endtime');
|
96
|
-
setStr(pl, 'qt', 'tarset');
|
97
|
-
setStr(pl, 'qt', 'qtsrcchokespeed');
|
98
|
-
setStr(pl, 'qt', 'volume');
|
99
|
-
setStr(pl, 'qt', 'qtsrc');
|
100
|
-
break;
|
101
|
-
|
102
|
-
case "shockwave":
|
103
|
-
setBool(pl, 'shockwave', 'sound');
|
104
|
-
setBool(pl, 'shockwave', 'progress');
|
105
|
-
setBool(pl, 'shockwave', 'autostart');
|
106
|
-
setBool(pl, 'shockwave', 'swliveconnect');
|
107
|
-
setStr(pl, 'shockwave', 'swvolume');
|
108
|
-
setStr(pl, 'shockwave', 'swstretchstyle');
|
109
|
-
setStr(pl, 'shockwave', 'swstretchhalign');
|
110
|
-
setStr(pl, 'shockwave', 'swstretchvalign');
|
111
|
-
break;
|
112
|
-
|
113
|
-
case "wmp":
|
114
|
-
setBool(pl, 'wmp', 'autostart');
|
115
|
-
setBool(pl, 'wmp', 'enabled');
|
116
|
-
setBool(pl, 'wmp', 'enablecontextmenu');
|
117
|
-
setBool(pl, 'wmp', 'fullscreen');
|
118
|
-
setBool(pl, 'wmp', 'invokeurls');
|
119
|
-
setBool(pl, 'wmp', 'mute');
|
120
|
-
setBool(pl, 'wmp', 'stretchtofit');
|
121
|
-
setBool(pl, 'wmp', 'windowlessvideo');
|
122
|
-
setStr(pl, 'wmp', 'balance');
|
123
|
-
setStr(pl, 'wmp', 'baseurl');
|
124
|
-
setStr(pl, 'wmp', 'captioningid');
|
125
|
-
setStr(pl, 'wmp', 'currentmarker');
|
126
|
-
setStr(pl, 'wmp', 'currentposition');
|
127
|
-
setStr(pl, 'wmp', 'defaultframe');
|
128
|
-
setStr(pl, 'wmp', 'playcount');
|
129
|
-
setStr(pl, 'wmp', 'rate');
|
130
|
-
setStr(pl, 'wmp', 'uimode');
|
131
|
-
setStr(pl, 'wmp', 'volume');
|
132
|
-
break;
|
133
|
-
|
134
|
-
case "rmp":
|
135
|
-
setBool(pl, 'rmp', 'autostart');
|
136
|
-
setBool(pl, 'rmp', 'loop');
|
137
|
-
setBool(pl, 'rmp', 'autogotourl');
|
138
|
-
setBool(pl, 'rmp', 'center');
|
139
|
-
setBool(pl, 'rmp', 'imagestatus');
|
140
|
-
setBool(pl, 'rmp', 'maintainaspect');
|
141
|
-
setBool(pl, 'rmp', 'nojava');
|
142
|
-
setBool(pl, 'rmp', 'prefetch');
|
143
|
-
setBool(pl, 'rmp', 'shuffle');
|
144
|
-
setStr(pl, 'rmp', 'console');
|
145
|
-
setStr(pl, 'rmp', 'controls');
|
146
|
-
setStr(pl, 'rmp', 'numloop');
|
147
|
-
setStr(pl, 'rmp', 'scriptcallbacks');
|
148
|
-
break;
|
149
|
-
}
|
150
|
-
|
151
|
-
setStr(pl, null, 'src');
|
152
|
-
setStr(pl, null, 'id');
|
153
|
-
setStr(pl, null, 'name');
|
154
|
-
setStr(pl, null, 'vspace');
|
155
|
-
setStr(pl, null, 'hspace');
|
156
|
-
setStr(pl, null, 'bgcolor');
|
157
|
-
setStr(pl, null, 'align');
|
158
|
-
setStr(pl, null, 'width');
|
159
|
-
setStr(pl, null, 'height');
|
160
|
-
|
161
|
-
if ((val = ed.dom.getAttrib(fe, "width")) != "")
|
162
|
-
pl.width = f.width.value = val;
|
163
|
-
|
164
|
-
if ((val = ed.dom.getAttrib(fe, "height")) != "")
|
165
|
-
pl.height = f.height.value = val;
|
166
|
-
|
167
|
-
oldWidth = pl.width ? parseInt(pl.width) : 0;
|
168
|
-
oldHeight = pl.height ? parseInt(pl.height) : 0;
|
169
|
-
} else
|
170
|
-
oldWidth = oldHeight = 0;
|
171
|
-
|
172
|
-
selectByValue(f, 'media_type', type);
|
173
|
-
changedType(type);
|
174
|
-
updateColor('bgcolor_pick', 'bgcolor');
|
11
|
+
function getVal(id) {
|
12
|
+
var elm = get(id);
|
175
13
|
|
176
|
-
|
177
|
-
|
178
|
-
}
|
14
|
+
if (elm.nodeName == "SELECT")
|
15
|
+
return elm.options[elm.selectedIndex].value;
|
179
16
|
|
180
|
-
|
181
|
-
|
17
|
+
if (elm.type == "checkbox")
|
18
|
+
return elm.checked;
|
182
19
|
|
183
|
-
|
184
|
-
|
185
|
-
if (!AutoValidator.validate(f)) {
|
186
|
-
tinyMCEPopup.alert(ed.getLang('invalid_data'));
|
187
|
-
return false;
|
20
|
+
return elm.value;
|
188
21
|
}
|
189
22
|
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
case "shockwave":
|
205
|
-
fe.className = "mceItemShockWave";
|
206
|
-
break;
|
207
|
-
|
208
|
-
case "qt":
|
209
|
-
fe.className = "mceItemQuickTime";
|
210
|
-
break;
|
211
|
-
|
212
|
-
case "wmp":
|
213
|
-
fe.className = "mceItemWindowsMedia";
|
214
|
-
break;
|
215
|
-
|
216
|
-
case "rmp":
|
217
|
-
fe.className = "mceItemRealMedia";
|
218
|
-
break;
|
219
|
-
}
|
220
|
-
|
221
|
-
if (fe.width != f.width.value || fe.height != f.height.value)
|
222
|
-
ed.execCommand('mceRepaint');
|
223
|
-
|
224
|
-
fe.title = serializeParameters();
|
225
|
-
fe.width = f.width.value;
|
226
|
-
fe.height = f.height.value;
|
227
|
-
fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');
|
228
|
-
fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');
|
229
|
-
fe.align = f.align.options[f.align.selectedIndex].value;
|
230
|
-
} else {
|
231
|
-
h = '<img src="' + tinyMCEPopup.getWindowArg("plugin_url") + '/img/trans.gif"' ;
|
232
|
-
|
233
|
-
switch (f.media_type.options[f.media_type.selectedIndex].value) {
|
234
|
-
case "flash":
|
235
|
-
h += ' class="mceItemFlash"';
|
236
|
-
break;
|
237
|
-
|
238
|
-
case "flv":
|
239
|
-
h += ' class="mceItemFlashVideo"';
|
240
|
-
break;
|
241
|
-
|
242
|
-
case "shockwave":
|
243
|
-
h += ' class="mceItemShockWave"';
|
244
|
-
break;
|
245
|
-
|
246
|
-
case "qt":
|
247
|
-
h += ' class="mceItemQuickTime"';
|
248
|
-
break;
|
249
|
-
|
250
|
-
case "wmp":
|
251
|
-
h += ' class="mceItemWindowsMedia"';
|
252
|
-
break;
|
253
|
-
|
254
|
-
case "rmp":
|
255
|
-
h += ' class="mceItemRealMedia"';
|
256
|
-
break;
|
23
|
+
function setVal(id, value, name) {
|
24
|
+
if (typeof(value) != 'undefined') {
|
25
|
+
var elm = get(id);
|
26
|
+
|
27
|
+
if (elm.nodeName == "SELECT")
|
28
|
+
selectByValue(document.forms[0], id, value);
|
29
|
+
else if (elm.type == "checkbox") {
|
30
|
+
if (typeof(value) == 'string') {
|
31
|
+
value = value.toLowerCase();
|
32
|
+
value = (!name && value === 'true') || (name && value === name.toLowerCase());
|
33
|
+
}
|
34
|
+
elm.checked = !!value;
|
35
|
+
} else
|
36
|
+
elm.value = value;
|
257
37
|
}
|
258
|
-
|
259
|
-
h += ' title="' + serializeParameters() + '"';
|
260
|
-
h += ' width="' + f.width.value + '"';
|
261
|
-
h += ' height="' + f.height.value + '"';
|
262
|
-
h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';
|
263
|
-
|
264
|
-
h += ' />';
|
265
|
-
|
266
|
-
ed.execCommand('mceInsertContent', false, h);
|
267
|
-
}
|
268
|
-
|
269
|
-
tinyMCEPopup.close();
|
270
|
-
}
|
271
|
-
|
272
|
-
function updatePreview() {
|
273
|
-
var f = document.forms[0], type;
|
274
|
-
|
275
|
-
f.width.value = f.width.value || '320';
|
276
|
-
f.height.value = f.height.value || '240';
|
277
|
-
|
278
|
-
type = getType(f.src.value);
|
279
|
-
selectByValue(f, 'media_type', type);
|
280
|
-
changedType(type);
|
281
|
-
generatePreview();
|
282
|
-
}
|
283
|
-
|
284
|
-
function getMediaListHTML() {
|
285
|
-
if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
|
286
|
-
var html = "";
|
287
|
-
|
288
|
-
html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;updatePreview();">';
|
289
|
-
html += '<option value="">---</option>';
|
290
|
-
|
291
|
-
for (var i=0; i<tinyMCEMediaList.length; i++)
|
292
|
-
html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
|
293
|
-
|
294
|
-
html += '</select>';
|
295
|
-
|
296
|
-
return html;
|
297
|
-
}
|
298
|
-
|
299
|
-
return "";
|
300
|
-
}
|
301
|
-
|
302
|
-
function getType(v) {
|
303
|
-
var fo, i, c, el, x, f = document.forms[0];
|
304
|
-
|
305
|
-
fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');
|
306
|
-
|
307
|
-
// YouTube
|
308
|
-
if (v.match(/watch\?v=(.+)(.*)/)) {
|
309
|
-
f.width.value = '425';
|
310
|
-
f.height.value = '350';
|
311
|
-
f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];
|
312
|
-
return 'flash';
|
313
38
|
}
|
314
39
|
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
return 'flash';
|
321
|
-
}
|
322
|
-
|
323
|
-
for (i=0; i<fo.length; i++) {
|
324
|
-
c = fo[i].split('=');
|
325
|
-
|
326
|
-
el = c[1].split(',');
|
327
|
-
for (x=0; x<el.length; x++)
|
328
|
-
if (v.indexOf('.' + el[x]) != -1)
|
329
|
-
return c[0];
|
330
|
-
}
|
331
|
-
|
332
|
-
return null;
|
333
|
-
}
|
334
|
-
|
335
|
-
function switchType(v) {
|
336
|
-
var t = getType(v), d = document, f = d.forms[0];
|
337
|
-
|
338
|
-
if (!t)
|
339
|
-
return;
|
340
|
-
|
341
|
-
selectByValue(d.forms[0], 'media_type', t);
|
342
|
-
changedType(t);
|
343
|
-
|
344
|
-
// Update qtsrc also
|
345
|
-
if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {
|
346
|
-
alert(ed.getLang("media_qt_stream_warn"));
|
347
|
-
|
348
|
-
if (f.qt_qtsrc.value == '')
|
349
|
-
f.qt_qtsrc.value = f.src.value;
|
350
|
-
}
|
351
|
-
}
|
352
|
-
|
353
|
-
function changedType(t) {
|
354
|
-
var d = document;
|
355
|
-
|
356
|
-
d.getElementById('flash_options').style.display = 'none';
|
357
|
-
d.getElementById('flv_options').style.display = 'none';
|
358
|
-
d.getElementById('qt_options').style.display = 'none';
|
359
|
-
d.getElementById('shockwave_options').style.display = 'none';
|
360
|
-
d.getElementById('wmp_options').style.display = 'none';
|
361
|
-
d.getElementById('rmp_options').style.display = 'none';
|
362
|
-
|
363
|
-
if (t)
|
364
|
-
d.getElementById(t + '_options').style.display = 'block';
|
365
|
-
}
|
366
|
-
|
367
|
-
function serializeParameters() {
|
368
|
-
var d = document, f = d.forms[0], s = '';
|
369
|
-
|
370
|
-
switch (f.media_type.options[f.media_type.selectedIndex].value) {
|
371
|
-
case "flash":
|
372
|
-
s += getBool('flash', 'play', true);
|
373
|
-
s += getBool('flash', 'loop', true);
|
374
|
-
s += getBool('flash', 'menu', true);
|
375
|
-
s += getBool('flash', 'swliveconnect', false);
|
376
|
-
s += getStr('flash', 'quality');
|
377
|
-
s += getStr('flash', 'scale');
|
378
|
-
s += getStr('flash', 'salign');
|
379
|
-
s += getStr('flash', 'wmode');
|
380
|
-
s += getStr('flash', 'base');
|
381
|
-
s += getStr('flash', 'flashvars');
|
382
|
-
break;
|
383
|
-
|
384
|
-
case "qt":
|
385
|
-
s += getBool('qt', 'loop', false);
|
386
|
-
s += getBool('qt', 'autoplay', true);
|
387
|
-
s += getBool('qt', 'cache', false);
|
388
|
-
s += getBool('qt', 'controller', true);
|
389
|
-
s += getBool('qt', 'correction', false, 'none', 'full');
|
390
|
-
s += getBool('qt', 'enablejavascript', false);
|
391
|
-
s += getBool('qt', 'kioskmode', false);
|
392
|
-
s += getBool('qt', 'autohref', false);
|
393
|
-
s += getBool('qt', 'playeveryframe', false);
|
394
|
-
s += getBool('qt', 'targetcache', false);
|
395
|
-
s += getStr('qt', 'scale');
|
396
|
-
s += getStr('qt', 'starttime');
|
397
|
-
s += getStr('qt', 'endtime');
|
398
|
-
s += getStr('qt', 'target');
|
399
|
-
s += getStr('qt', 'qtsrcchokespeed');
|
400
|
-
s += getStr('qt', 'volume');
|
401
|
-
s += getStr('qt', 'qtsrc');
|
402
|
-
break;
|
403
|
-
|
404
|
-
case "shockwave":
|
405
|
-
s += getBool('shockwave', 'sound');
|
406
|
-
s += getBool('shockwave', 'progress');
|
407
|
-
s += getBool('shockwave', 'autostart');
|
408
|
-
s += getBool('shockwave', 'swliveconnect');
|
409
|
-
s += getStr('shockwave', 'swvolume');
|
410
|
-
s += getStr('shockwave', 'swstretchstyle');
|
411
|
-
s += getStr('shockwave', 'swstretchhalign');
|
412
|
-
s += getStr('shockwave', 'swstretchvalign');
|
413
|
-
break;
|
414
|
-
|
415
|
-
case "wmp":
|
416
|
-
s += getBool('wmp', 'autostart', true);
|
417
|
-
s += getBool('wmp', 'enabled', false);
|
418
|
-
s += getBool('wmp', 'enablecontextmenu', true);
|
419
|
-
s += getBool('wmp', 'fullscreen', false);
|
420
|
-
s += getBool('wmp', 'invokeurls', true);
|
421
|
-
s += getBool('wmp', 'mute', false);
|
422
|
-
s += getBool('wmp', 'stretchtofit', false);
|
423
|
-
s += getBool('wmp', 'windowlessvideo', false);
|
424
|
-
s += getStr('wmp', 'balance');
|
425
|
-
s += getStr('wmp', 'baseurl');
|
426
|
-
s += getStr('wmp', 'captioningid');
|
427
|
-
s += getStr('wmp', 'currentmarker');
|
428
|
-
s += getStr('wmp', 'currentposition');
|
429
|
-
s += getStr('wmp', 'defaultframe');
|
430
|
-
s += getStr('wmp', 'playcount');
|
431
|
-
s += getStr('wmp', 'rate');
|
432
|
-
s += getStr('wmp', 'uimode');
|
433
|
-
s += getStr('wmp', 'volume');
|
434
|
-
break;
|
435
|
-
|
436
|
-
case "rmp":
|
437
|
-
s += getBool('rmp', 'autostart', false);
|
438
|
-
s += getBool('rmp', 'loop', false);
|
439
|
-
s += getBool('rmp', 'autogotourl', true);
|
440
|
-
s += getBool('rmp', 'center', false);
|
441
|
-
s += getBool('rmp', 'imagestatus', true);
|
442
|
-
s += getBool('rmp', 'maintainaspect', false);
|
443
|
-
s += getBool('rmp', 'nojava', false);
|
444
|
-
s += getBool('rmp', 'prefetch', false);
|
445
|
-
s += getBool('rmp', 'shuffle', false);
|
446
|
-
s += getStr('rmp', 'console');
|
447
|
-
s += getStr('rmp', 'controls');
|
448
|
-
s += getStr('rmp', 'numloop');
|
449
|
-
s += getStr('rmp', 'scriptcallbacks');
|
450
|
-
break;
|
451
|
-
}
|
452
|
-
|
453
|
-
s += getStr(null, 'id');
|
454
|
-
s += getStr(null, 'name');
|
455
|
-
s += getStr(null, 'src');
|
456
|
-
s += getStr(null, 'align');
|
457
|
-
s += getStr(null, 'bgcolor');
|
458
|
-
s += getInt(null, 'vspace');
|
459
|
-
s += getInt(null, 'hspace');
|
460
|
-
s += getStr(null, 'width');
|
461
|
-
s += getStr(null, 'height');
|
462
|
-
|
463
|
-
s = s.length > 0 ? s.substring(0, s.length - 1) : s;
|
464
|
-
|
465
|
-
return s;
|
466
|
-
}
|
467
|
-
|
468
|
-
function setBool(pl, p, n) {
|
469
|
-
if (typeof(pl[n]) == "undefined")
|
470
|
-
return;
|
471
|
-
|
472
|
-
document.forms[0].elements[p + "_" + n].checked = pl[n] != 'false';
|
473
|
-
}
|
474
|
-
|
475
|
-
function setStr(pl, p, n) {
|
476
|
-
var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];
|
477
|
-
|
478
|
-
if (typeof(pl[n]) == "undefined")
|
479
|
-
return;
|
480
|
-
|
481
|
-
if (e.type == "text")
|
482
|
-
e.value = pl[n];
|
483
|
-
else
|
484
|
-
selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);
|
485
|
-
}
|
486
|
-
|
487
|
-
function getBool(p, n, d, tv, fv) {
|
488
|
-
var v = document.forms[0].elements[p + "_" + n].checked;
|
489
|
-
|
490
|
-
tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
|
491
|
-
fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
|
492
|
-
|
493
|
-
return (v == d) ? '' : n + (v ? ':' + tv + ',' : ":\'" + fv + "\',");
|
494
|
-
}
|
40
|
+
window.Media = {
|
41
|
+
init : function() {
|
42
|
+
var html, editor;
|
43
|
+
|
44
|
+
this.editor = editor = tinyMCEPopup.editor;
|
495
45
|
|
496
|
-
|
497
|
-
|
498
|
-
|
499
|
-
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
|
515
|
-
|
516
|
-
|
46
|
+
// Setup file browsers and color pickers
|
47
|
+
get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
|
48
|
+
get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');
|
49
|
+
get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
|
50
|
+
get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource1','video_altsource1','media','media');
|
51
|
+
get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource2','video_altsource2','media','media');
|
52
|
+
get('audio_altsource1_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource1','audio_altsource1','media','media');
|
53
|
+
get('audio_altsource2_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource2','audio_altsource2','media','media');
|
54
|
+
get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');
|
55
|
+
|
56
|
+
html = this.getMediaListHTML('medialist', 'src', 'media', 'media');
|
57
|
+
if (html == "")
|
58
|
+
get("linklistrow").style.display = 'none';
|
59
|
+
else
|
60
|
+
get("linklistcontainer").innerHTML = html;
|
61
|
+
|
62
|
+
if (isVisible('filebrowser'))
|
63
|
+
get('src').style.width = '230px';
|
64
|
+
|
65
|
+
if (isVisible('video_filebrowser_altsource1'))
|
66
|
+
get('video_altsource1').style.width = '220px';
|
67
|
+
|
68
|
+
if (isVisible('video_filebrowser_altsource2'))
|
69
|
+
get('video_altsource2').style.width = '220px';
|
70
|
+
|
71
|
+
if (isVisible('audio_filebrowser_altsource1'))
|
72
|
+
get('audio_altsource1').style.width = '220px';
|
73
|
+
|
74
|
+
if (isVisible('audio_filebrowser_altsource2'))
|
75
|
+
get('audio_altsource2').style.width = '220px';
|
76
|
+
|
77
|
+
if (isVisible('filebrowser_poster'))
|
78
|
+
get('video_poster').style.width = '220px';
|
79
|
+
|
80
|
+
this.data = tinyMCEPopup.getWindowArg('data');
|
81
|
+
this.dataToForm();
|
82
|
+
this.preview();
|
83
|
+
},
|
84
|
+
|
85
|
+
insert : function() {
|
86
|
+
var editor = tinyMCEPopup.editor;
|
87
|
+
|
88
|
+
this.formToData();
|
89
|
+
editor.execCommand('mceRepaint');
|
90
|
+
tinyMCEPopup.restoreSelection();
|
91
|
+
editor.selection.setNode(editor.plugins.media.dataToImg(this.data));
|
92
|
+
tinyMCEPopup.close();
|
93
|
+
},
|
94
|
+
|
95
|
+
preview : function() {
|
96
|
+
get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);
|
97
|
+
},
|
98
|
+
|
99
|
+
moveStates : function(to_form, field) {
|
100
|
+
var data = this.data, editor = this.editor, data = this.data,
|
101
|
+
mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;
|
102
|
+
|
103
|
+
defaultStates = {
|
104
|
+
// QuickTime
|
105
|
+
quicktime_autoplay : true,
|
106
|
+
quicktime_controller : true,
|
107
|
+
|
108
|
+
// Flash
|
109
|
+
flash_play : true,
|
110
|
+
flash_loop : true,
|
111
|
+
flash_menu : true,
|
112
|
+
|
113
|
+
// WindowsMedia
|
114
|
+
windowsmedia_autostart : true,
|
115
|
+
windowsmedia_enablecontextmenu : true,
|
116
|
+
windowsmedia_invokeurls : true,
|
117
|
+
|
118
|
+
// RealMedia
|
119
|
+
realmedia_autogotourl : true,
|
120
|
+
realmedia_imagestatus : true
|
121
|
+
};
|
122
|
+
|
123
|
+
function parseQueryParams(str) {
|
124
|
+
var out = {};
|
125
|
+
|
126
|
+
if (str) {
|
127
|
+
tinymce.each(str.split('&'), function(item) {
|
128
|
+
var parts = item.split('=');
|
129
|
+
|
130
|
+
out[unescape(parts[0])] = unescape(parts[1]);
|
131
|
+
});
|
132
|
+
}
|
133
|
+
|
134
|
+
return out;
|
135
|
+
};
|
136
|
+
|
137
|
+
function setOptions(type, names) {
|
138
|
+
var i, name, formItemName, value, list;
|
139
|
+
|
140
|
+
if (type == data.type || type == 'global') {
|
141
|
+
names = tinymce.explode(names);
|
142
|
+
for (i = 0; i < names.length; i++) {
|
143
|
+
name = names[i];
|
144
|
+
formItemName = type == 'global' ? name : type + '_' + name;
|
145
|
+
|
146
|
+
if (type == 'global')
|
147
|
+
list = data;
|
148
|
+
else if (type == 'video' || type == 'audio') {
|
149
|
+
list = data.video.attrs;
|
150
|
+
|
151
|
+
if (!list && !to_form)
|
152
|
+
data.video.attrs = list = {};
|
153
|
+
} else
|
154
|
+
list = data.params;
|
155
|
+
|
156
|
+
if (list) {
|
157
|
+
if (to_form) {
|
158
|
+
setVal(formItemName, list[name], type == 'video' || type == 'audio' ? name : '');
|
159
|
+
} else {
|
160
|
+
delete list[name];
|
161
|
+
|
162
|
+
value = getVal(formItemName);
|
163
|
+
if ((type == 'video' || type == 'audio') && value === true)
|
164
|
+
value = name;
|
165
|
+
|
166
|
+
if (defaultStates[formItemName]) {
|
167
|
+
if (value !== defaultStates[formItemName]) {
|
168
|
+
value = "" + value;
|
169
|
+
list[name] = value;
|
170
|
+
}
|
171
|
+
} else if (value) {
|
172
|
+
value = "" + value;
|
173
|
+
list[name] = value;
|
174
|
+
}
|
175
|
+
}
|
176
|
+
}
|
177
|
+
}
|
178
|
+
}
|
179
|
+
}
|
517
180
|
|
518
|
-
|
519
|
-
|
181
|
+
if (!to_form) {
|
182
|
+
data.type = get('media_type').options[get('media_type').selectedIndex].value;
|
183
|
+
data.width = getVal('width');
|
184
|
+
data.height = getVal('height');
|
520
185
|
|
521
|
-
|
522
|
-
|
186
|
+
// Switch type based on extension
|
187
|
+
src = getVal('src');
|
188
|
+
if (field == 'src') {
|
189
|
+
ext = src.replace(/^.*\.([^.]+)$/, '$1');
|
190
|
+
if (typeInfo = mediaPlugin.getType(ext))
|
191
|
+
data.type = typeInfo.name.toLowerCase();
|
523
192
|
|
524
|
-
|
193
|
+
setVal('media_type', data.type);
|
194
|
+
}
|
525
195
|
|
526
|
-
|
527
|
-
|
196
|
+
if (data.type == "video" || data.type == "audio") {
|
197
|
+
if (!data.video.sources)
|
198
|
+
data.video.sources = [];
|
528
199
|
|
529
|
-
|
530
|
-
|
531
|
-
if (c == 'width' && oldWidth != 0) {
|
532
|
-
wp = nw / oldWidth;
|
533
|
-
nh = Math.round(wp * nh);
|
534
|
-
f.height.value = nh;
|
535
|
-
} else if (c == 'height' && oldHeight != 0) {
|
536
|
-
hp = nh / oldHeight;
|
537
|
-
nw = Math.round(hp * nw);
|
538
|
-
f.width.value = nw;
|
200
|
+
data.video.sources[0] = {src: getVal('src')};
|
201
|
+
}
|
539
202
|
}
|
540
|
-
}
|
541
|
-
}
|
542
203
|
|
543
|
-
|
544
|
-
|
545
|
-
|
546
|
-
|
547
|
-
|
548
|
-
|
549
|
-
|
550
|
-
|
551
|
-
|
552
|
-
|
553
|
-
|
554
|
-
|
555
|
-
|
556
|
-
|
557
|
-
|
558
|
-
|
559
|
-
|
560
|
-
|
561
|
-
|
562
|
-
|
563
|
-
|
564
|
-
|
565
|
-
|
566
|
-
|
567
|
-
|
568
|
-
|
569
|
-
|
570
|
-
|
571
|
-
|
572
|
-
|
573
|
-
|
574
|
-
|
575
|
-
|
576
|
-
|
577
|
-
|
578
|
-
|
579
|
-
|
580
|
-
|
581
|
-
|
582
|
-
|
583
|
-
|
584
|
-
|
585
|
-
|
586
|
-
|
587
|
-
|
204
|
+
// Hide all fieldsets and show the one active
|
205
|
+
get('video_options').style.display = 'none';
|
206
|
+
get('audio_options').style.display = 'none';
|
207
|
+
get('flash_options').style.display = 'none';
|
208
|
+
get('quicktime_options').style.display = 'none';
|
209
|
+
get('shockwave_options').style.display = 'none';
|
210
|
+
get('windowsmedia_options').style.display = 'none';
|
211
|
+
get('realmedia_options').style.display = 'none';
|
212
|
+
|
213
|
+
if (get(data.type + '_options'))
|
214
|
+
get(data.type + '_options').style.display = 'block';
|
215
|
+
|
216
|
+
setVal('media_type', data.type);
|
217
|
+
|
218
|
+
setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');
|
219
|
+
setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');
|
220
|
+
setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');
|
221
|
+
setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');
|
222
|
+
setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');
|
223
|
+
setOptions('video', 'poster,autoplay,loop,muted,preload,controls');
|
224
|
+
setOptions('audio', 'autoplay,loop,preload,controls');
|
225
|
+
setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');
|
226
|
+
|
227
|
+
if (to_form) {
|
228
|
+
if (data.type == 'video') {
|
229
|
+
if (data.video.sources[0])
|
230
|
+
setVal('src', data.video.sources[0].src);
|
231
|
+
|
232
|
+
src = data.video.sources[1];
|
233
|
+
if (src)
|
234
|
+
setVal('video_altsource1', src.src);
|
235
|
+
|
236
|
+
src = data.video.sources[2];
|
237
|
+
if (src)
|
238
|
+
setVal('video_altsource2', src.src);
|
239
|
+
} else if (data.type == 'audio') {
|
240
|
+
if (data.video.sources[0])
|
241
|
+
setVal('src', data.video.sources[0].src);
|
242
|
+
|
243
|
+
src = data.video.sources[1];
|
244
|
+
if (src)
|
245
|
+
setVal('audio_altsource1', src.src);
|
246
|
+
|
247
|
+
src = data.video.sources[2];
|
248
|
+
if (src)
|
249
|
+
setVal('audio_altsource2', src.src);
|
250
|
+
} else {
|
251
|
+
// Check flash vars
|
252
|
+
if (data.type == 'flash') {
|
253
|
+
tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {
|
254
|
+
if (value == '$url')
|
255
|
+
data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;
|
256
|
+
});
|
257
|
+
}
|
258
|
+
|
259
|
+
setVal('src', data.params.src);
|
260
|
+
}
|
261
|
+
} else {
|
262
|
+
src = getVal("src");
|
263
|
+
|
264
|
+
// YouTube
|
265
|
+
if (src.match(/youtube.com(.+)v=([^&]+)/)) {
|
266
|
+
data.width = 425;
|
267
|
+
data.height = 350;
|
268
|
+
data.params.frameborder = '0';
|
269
|
+
data.type = 'iframe';
|
270
|
+
src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
|
271
|
+
setVal('src', src);
|
272
|
+
setVal('media_type', data.type);
|
273
|
+
}
|
274
|
+
|
275
|
+
// Google video
|
276
|
+
if (src.match(/video.google.com(.+)docid=([^&]+)/)) {
|
277
|
+
data.width = 425;
|
278
|
+
data.height = 326;
|
279
|
+
data.type = 'flash';
|
280
|
+
src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';
|
281
|
+
setVal('src', src);
|
282
|
+
setVal('media_type', data.type);
|
283
|
+
}
|
284
|
+
|
285
|
+
if (data.type == 'video') {
|
286
|
+
if (!data.video.sources)
|
287
|
+
data.video.sources = [];
|
288
|
+
|
289
|
+
data.video.sources[0] = {src : src};
|
290
|
+
|
291
|
+
src = getVal("video_altsource1");
|
292
|
+
if (src)
|
293
|
+
data.video.sources[1] = {src : src};
|
294
|
+
|
295
|
+
src = getVal("video_altsource2");
|
296
|
+
if (src)
|
297
|
+
data.video.sources[2] = {src : src};
|
298
|
+
} else if (data.type == 'audio') {
|
299
|
+
if (!data.video.sources)
|
300
|
+
data.video.sources = [];
|
301
|
+
|
302
|
+
data.video.sources[0] = {src : src};
|
303
|
+
|
304
|
+
src = getVal("audio_altsource1");
|
305
|
+
if (src)
|
306
|
+
data.video.sources[1] = {src : src};
|
307
|
+
|
308
|
+
src = getVal("audio_altsource2");
|
309
|
+
if (src)
|
310
|
+
data.video.sources[2] = {src : src};
|
311
|
+
} else
|
312
|
+
data.params.src = src;
|
313
|
+
|
314
|
+
// Set default size
|
315
|
+
setVal('width', data.width || (data.type == 'audio' ? 300 : 320));
|
316
|
+
setVal('height', data.height || (data.type == 'audio' ? 32 : 240));
|
317
|
+
}
|
318
|
+
},
|
319
|
+
|
320
|
+
dataToForm : function() {
|
321
|
+
this.moveStates(true);
|
322
|
+
},
|
323
|
+
|
324
|
+
formToData : function(field) {
|
325
|
+
if (field == "width" || field == "height")
|
326
|
+
this.changeSize(field);
|
327
|
+
|
328
|
+
if (field == 'source') {
|
329
|
+
this.moveStates(false, field);
|
330
|
+
setVal('source', this.editor.plugins.media.dataToHtml(this.data));
|
331
|
+
this.panel = 'source';
|
332
|
+
} else {
|
333
|
+
if (this.panel == 'source') {
|
334
|
+
this.data = this.editor.plugins.media.htmlToData(getVal('source'));
|
335
|
+
this.dataToForm();
|
336
|
+
this.panel = '';
|
337
|
+
}
|
338
|
+
|
339
|
+
this.moveStates(false, field);
|
340
|
+
this.preview();
|
341
|
+
}
|
342
|
+
},
|
343
|
+
|
344
|
+
beforeResize : function() {
|
345
|
+
this.width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);
|
346
|
+
this.height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);
|
347
|
+
},
|
348
|
+
|
349
|
+
changeSize : function(type) {
|
350
|
+
var width, height, scale, size;
|
351
|
+
|
352
|
+
if (get('constrain').checked) {
|
353
|
+
width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);
|
354
|
+
height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);
|
355
|
+
|
356
|
+
if (type == 'width') {
|
357
|
+
this.height = Math.round((width / this.width) * height);
|
358
|
+
setVal('height', this.height);
|
359
|
+
} else {
|
360
|
+
this.width = Math.round((height / this.height) * width);
|
361
|
+
setVal('width', this.width);
|
362
|
+
}
|
363
|
+
}
|
364
|
+
},
|
588
365
|
|
589
|
-
|
366
|
+
getMediaListHTML : function() {
|
367
|
+
if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
|
368
|
+
var html = "";
|
590
369
|
|
591
|
-
|
592
|
-
|
593
|
-
return;
|
594
|
-
}
|
370
|
+
html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
|
371
|
+
html += '<option value="">---</option>';
|
595
372
|
|
596
|
-
|
597
|
-
|
598
|
-
pl.height = !pl.height ? 100 : pl.height;
|
599
|
-
pl.id = !pl.id ? 'obj' : pl.id;
|
600
|
-
pl.name = !pl.name ? 'eobj' : pl.name;
|
601
|
-
pl.align = !pl.align ? '' : pl.align;
|
373
|
+
for (var i=0; i<tinyMCEMediaList.length; i++)
|
374
|
+
html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
|
602
375
|
|
603
|
-
|
604
|
-
if (!tinymce.isIE || document.location.protocol != 'https:') {
|
605
|
-
h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
|
376
|
+
html += '</select>';
|
606
377
|
|
607
|
-
|
608
|
-
|
378
|
+
return html;
|
379
|
+
}
|
609
380
|
|
610
|
-
|
611
|
-
if (n == 'src' && pl[n].indexOf('://') != -1)
|
612
|
-
h += '<param name="url" value="' + pl[n] + '" />';
|
381
|
+
return "";
|
613
382
|
}
|
614
|
-
}
|
615
|
-
|
616
|
-
h += '<embed type="' + type + '" ';
|
617
|
-
|
618
|
-
for (n in pl)
|
619
|
-
h += n + '="' + pl[n] + '" ';
|
620
|
-
|
621
|
-
h += '></embed>';
|
622
|
-
|
623
|
-
// Avoid annoying warning about insecure items
|
624
|
-
if (!tinymce.isIE || document.location.protocol != 'https:')
|
625
|
-
h += '</object>';
|
626
|
-
|
627
|
-
p.innerHTML = "<!-- x --->" + h;
|
628
|
-
}
|
383
|
+
};
|
629
384
|
|
630
|
-
tinyMCEPopup.
|
385
|
+
tinyMCEPopup.requireLangPack();
|
386
|
+
tinyMCEPopup.onInit.add(function() {
|
387
|
+
Media.init();
|
388
|
+
});
|
389
|
+
})();
|