skylinecms 3.0.8 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG +131 -10
- data/README.md +1 -2
- data/Rakefile +3 -3
- data/app/controllers/skyline/application_controller.rb +40 -4
- data/app/controllers/skyline/articles_controller.rb +4 -4
- data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb +1 -1
- data/app/controllers/skyline/content_controller.rb +4 -3
- data/app/controllers/skyline/{media_files_data_controller.rb → media/data_controller.rb} +61 -59
- data/app/controllers/skyline/media/dirs_controller.rb +83 -0
- data/app/controllers/skyline/media/files_controller.rb +80 -0
- data/app/controllers/skyline/sections_controller.rb +10 -3
- data/app/controllers/skyline/settings_controller.rb +4 -2
- data/app/controllers/skyline/user_preferences_controller.rb +18 -0
- data/app/controllers/skyline/users_controller.rb +1 -1
- data/app/controllers/skyline/variant_current_editor_controller.rb +2 -0
- data/app/helpers/skyline/application_helper.rb +39 -35
- data/app/helpers/skyline/dialog_helper.rb +11 -10
- data/app/helpers/skyline/editors/boolean.rb +2 -2
- data/app/helpers/skyline/editors/page_browser.rb +2 -0
- data/app/helpers/skyline/editors/wysiwyg.rb +1 -1
- data/app/helpers/skyline/js_layout_helper.rb +19 -0
- data/app/helpers/skyline/media/dirs_helper.rb +2 -0
- data/app/helpers/skyline/media/files_helper.rb +6 -0
- data/app/helpers/skyline/media_files_helper.rb +2 -2
- data/app/helpers/skyline/menu_helper.rb +33 -0
- data/app/helpers/skyline/message_generator.rb +5 -1
- data/app/helpers/skyline/notification_generator.rb +6 -0
- data/app/helpers/skyline/plugin_helper.rb +21 -0
- data/app/helpers/skyline/presenters/presenter.rb +4 -13
- data/app/helpers/skyline/presenters/table.rb +0 -27
- data/app/helpers/skyline/ref_object_helper.rb +2 -2
- data/app/helpers/skyline/tree_helper.rb +74 -5
- data/app/models/skyline/article.rb +18 -6
- data/app/models/skyline/article_version.rb +1 -1
- data/app/models/skyline/image_ref.rb +9 -5
- data/app/models/skyline/inline_ref.rb +3 -2
- data/app/models/skyline/link_section_link.rb +2 -2
- data/app/models/skyline/media_file.rb +33 -10
- data/app/models/skyline/page.rb +10 -9
- data/app/models/skyline/section.rb +1 -1
- data/app/models/skyline/sections/content_collection_section.rb +1 -1
- data/app/models/skyline/sections/content_item_section.rb +1 -1
- data/app/models/skyline/sections/heading_section.rb +1 -1
- data/app/models/skyline/sections/iframe_section.rb +2 -2
- data/app/models/skyline/sections/link_section.rb +1 -1
- data/app/models/skyline/sections/media_section.rb +32 -5
- data/app/models/skyline/sections/page_fragment_section.rb +1 -1
- data/app/models/skyline/sections/raw_section.rb +1 -1
- data/app/models/skyline/sections/redirect_section.rb +4 -4
- data/app/models/skyline/sections/rss_section.rb +7 -2
- data/app/models/skyline/sections/splitter_section.rb +1 -1
- data/app/models/skyline/sections/wysiwyg_section.rb +3 -3
- data/app/models/skyline/site.rb +1 -1
- data/app/models/skyline/user.rb +1 -1
- data/app/models/skyline/user_preference.rb +69 -0
- data/app/models/skyline/variant.rb +1 -1
- data/app/templates/skyline/sections/content_item_section/default/index.html.erb +1 -1
- data/app/templates/skyline/sections/media_section/default/index.html.erb +9 -9
- data/app/views/skyline/articles/_list.html.erb +34 -0
- data/app/views/skyline/articles/edit.html.erb +13 -6
- data/app/views/skyline/articles/index.html.erb +12 -43
- data/app/views/skyline/articles/page/_index.html.erb +13 -11
- data/app/views/skyline/authentications/new.html.erb +2 -2
- data/app/views/skyline/browser/links/_index.html.erb +4 -2
- data/app/views/skyline/browser/tabs/media_library/_index.html.erb +12 -13
- data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb +122 -51
- data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb +7 -7
- data/app/views/skyline/content/list.rhtml +1 -3
- data/app/views/skyline/content/presenters/_table.html.erb +45 -0
- data/app/views/skyline/layouts/content.html.erb +1 -1
- data/app/views/skyline/layouts/media.html.erb +2 -1
- data/app/views/skyline/layouts/pages.html.erb +10 -0
- data/app/views/skyline/link_section_links/_form.html.erb +0 -1
- data/app/views/skyline/locales/show.js.erb +2 -2
- data/app/views/skyline/media/dirs/_edit.html.erb +42 -0
- data/app/views/skyline/media/dirs/_index.html.erb +14 -0
- data/app/views/skyline/media/dirs/_show.html.erb +34 -0
- data/app/views/skyline/media/dirs/index.html.erb +36 -0
- data/app/views/skyline/media/files/_edit.html.erb +101 -0
- data/app/views/skyline/media/files/_index.html.erb +68 -0
- data/app/views/skyline/media/files/_new.html.erb +45 -0
- data/app/views/skyline/publications/_index.html.erb +2 -2
- data/app/views/skyline/sections/_media_section.html.erb +12 -2
- data/app/views/skyline/sections/_wysiwyg_section.html.erb +2 -3
- data/app/views/skyline/settings/index.html +14 -0
- data/app/views/skyline/shared/_head.html.erb +2 -0
- data/app/views/skyline/shared/_header_area.html.erb +7 -5
- data/app/views/skyline/users/index.html.erb +31 -16
- data/config/initializers/dependencies.rb +6 -1
- data/config/initializers/observers.rb +1 -2
- data/config/initializers/rails_defaults.rb +1 -1
- data/config/locales/en-US.yml +110 -68
- data/config/locales/nl-NL.yml +117 -77
- data/config/routes.rb +36 -32
- data/db/fixtures/roles_and_rights.rb +65 -40
- data/db/migrate/20090302102548_add_media_nodes.rb +2 -2
- data/db/migrate/20090309133933_add_description_to_media_nodes.rb +2 -2
- data/db/migrate/20090309134731_add_tags.rb +2 -2
- data/db/migrate/20090309135746_create_media_files_tags.rb +2 -2
- data/db/migrate/20090319091342_create_media_caches.rb +2 -2
- data/db/migrate/20090327083240_create_users.rb +2 -2
- data/db/migrate/20090327084656_create_roles.rb +2 -2
- data/db/migrate/20090327084719_create_rights.rb +2 -2
- data/db/migrate/20090327084739_create_grants.rb +2 -2
- data/db/migrate/20090327090918_create_rights_roles.rb +2 -2
- data/db/migrate/20090408115155_create_ref_objects.rb +2 -2
- data/db/migrate/20090504140044_create_test_sections.rb +2 -2
- data/db/migrate/20090506083107_add_refering_column_name_to_ref_objects.rb +2 -2
- data/db/migrate/20090706124019_add_skyline_media_node_title.rb +1 -1
- data/db/migrate/20090904121447_create_skyline_referable_uris.rb +6 -6
- data/db/migrate/20091221145204_add_skyline_media_section_link.rb +11 -0
- data/db/migrate/20100109145958_add_associated_tags_index.rb +9 -0
- data/db/migrate/20100115111440_create_skyline_user_preferences.rb +14 -0
- data/db/migrate/20100120113953_remove_unused_articles_index.rb +9 -0
- data/db/migrate/20100409073447_change_referable_uri_to_text.rb +9 -0
- data/doc/Bundler.md +33 -28
- data/doc/MIGRATION.md +48 -0
- data/lib/skyline/{content_item.rb → belongs_to_referable.rb} +57 -88
- data/lib/skyline/configuration.rb +14 -15
- data/lib/skyline/content/content.rb +14 -2
- data/lib/skyline/deprecated/version3_0_8.rb +106 -0
- data/lib/skyline/{form_builder_with_errors.rb → form_builder.rb} +5 -5
- data/lib/skyline/{referable.rb → has_many_referables_in.rb} +22 -12
- data/lib/skyline/javascript_generator_methods.rb +1 -1
- data/lib/skyline/plugins_manager.rb +135 -14
- data/lib/skyline/rendering/helpers/renderer_helper.rb +14 -9
- data/lib/skyline/{renderer.rb → rendering/renderer.rb} +3 -4
- data/lib/skyline/{renderable_scope_interface.rb → rendering/scopes/interface.rb} +1 -1
- data/lib/skyline/{wildcard_renderable_scope.rb → rendering/scopes/wildcard.rb} +3 -3
- data/lib/skyline/{section_item.rb → sections/interface.rb} +17 -10
- data/lib/skyline/settings.rb +29 -19
- data/lib/skyline/taggable.rb +3 -3
- data/lib/skyline/version.rb +2 -2
- data/{tasks → lib/tasks}/database.rake +14 -2
- data/{tasks → lib/tasks}/implementation.rake +0 -0
- data/lib/tasks/testing.rake +41 -0
- data/public/skyline/images/backgrounds/panel-dt.gif +0 -0
- data/public/skyline/javascripts/src/application.js +114 -120
- data/public/skyline/javascripts/src/browser.js +22 -4
- data/public/skyline/javascripts/src/library_uploader.js +13 -3
- data/public/skyline/javascripts/src/sections.js +57 -6
- data/public/skyline/javascripts/src/skyline/src/dialog.js +6 -0
- data/public/skyline/javascripts/src/skyline/src/drag.js +6 -0
- data/public/skyline/javascripts/src/skyline/src/events.js +50 -0
- data/public/skyline/javascripts/src/skyline/src/field_replicator.js +12 -11
- data/public/skyline/javascripts/src/skyline/src/layout.js +172 -30
- data/public/skyline/javascripts/src/skyline/src/menu.js +3 -0
- data/public/skyline/javascripts/src/skyline/src/menubutton.js +3 -0
- data/public/skyline/javascripts/src/skyline/src/skyline.js +3 -0
- data/public/skyline/javascripts/src/skyline/src/table.js +398 -0
- data/public/skyline/javascripts/src/skyline/src/tabs.js +2 -2
- data/public/skyline/javascripts/src/skyline/src/tag_selector.js +34 -26
- data/public/skyline/javascripts/src/skyline/src/tree.js +3 -0
- data/public/skyline/javascripts/src/skyline/src/uploader.js +2 -2
- data/public/skyline/javascripts/src/skyline/src/utils.js +3 -0
- data/public/skyline/javascripts/src/skyline/test/_dynamic_right.html +24 -0
- data/public/skyline/javascripts/src/skyline/test/_right_content.html +1 -0
- data/public/skyline/javascripts/src/skyline/test/basic_layout.html +190 -0
- data/public/skyline/javascripts/src/skyline/test/dialog.html +101 -0
- data/public/skyline/javascripts/src/skyline/test/draggablefiles.html +196 -0
- data/public/skyline/javascripts/src/skyline/test/dynamic_layout.html +89 -0
- data/public/skyline/javascripts/src/skyline/test/field_replicator.html +60 -0
- data/public/skyline/javascripts/src/skyline/test/last-closed.gif +0 -0
- data/public/skyline/javascripts/src/skyline/test/last-open.gif +0 -0
- data/public/skyline/javascripts/src/skyline/test/menubutton.html +81 -0
- data/public/skyline/javascripts/src/skyline/test/middle.gif +0 -0
- data/public/skyline/javascripts/src/skyline/test/sortable.html +121 -0
- data/public/skyline/javascripts/src/skyline/test/table.html +521 -0
- data/public/skyline/javascripts/src/skyline/test/tagselector.html +72 -0
- data/public/skyline/javascripts/src/skyline/test/toggle.html +95 -0
- data/public/skyline/javascripts/src/skyline/test/tree.html +310 -0
- data/public/skyline/javascripts/src/skyline/test/tree.png +0 -0
- data/public/skyline/javascripts/src/skyline/test/undohtml.css +27 -0
- data/public/skyline/javascripts/src/skyline/vendor/fancyupload/Swiff.Uploader.js +2 -2
- data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-core.js +1 -354
- data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-more.js +64 -52
- data/public/skyline/javascripts/src/skyline.editor/assets/content.css +1 -1
- data/public/skyline/javascripts/src/skyline.editor/src/script_loader.js +156 -75
- data/public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js +14 -4
- data/public/skyline/javascripts/src/skyline.editor/src/theme.js +8 -0
- data/public/skyline/javascripts/src/skyline.editor/test/dialog.html +28 -0
- data/public/skyline/javascripts/src/skyline.editor/test/lorem.html +7 -0
- data/public/skyline/javascripts/src/skyline.editor/test/multiple_editors.html +87 -0
- data/public/skyline/javascripts/src/skyline.editor/test/undohtml.css +27 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/changelog.txt +205 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/css/content.css +54 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/custom_formats.html +111 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full.html +19 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/menu.html +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/simple.html +6 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/skins.html +14 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/translate.html +7 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/word.html +8 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/langs/en.js +18 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js +154 -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 +52 -44
- 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 +388 -17
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js +4 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +6 -3
- 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 +58 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js +8 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js +6 -3
- 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 +10 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +18 -8
- 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 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +136 -0
- 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 +18 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm +2 -7
- 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 +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js +6 -3
- 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 +564 -124
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm +2 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm +2 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js +6 -3
- 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 +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js +4 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm +4 -9
- 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 +106 -27
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js +6 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +4 -11
- 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 +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm +2 -7
- 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 +921 -918
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +41 -24
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js +18 -20
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js +48 -23
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +24 -15
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +3 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js +10 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/template.htm +2 -9
- 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 +26 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +98 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm +3 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm +3 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm +3 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm +3 -11
- 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 +11 -15
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm +3 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js +8 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js +8 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js +7 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm +1 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +2 -4
- 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 +252 -188
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm +2 -7
- 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/js/anchor.js +7 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js +10 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +2 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +4 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm +2 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +7 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css +4 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css +5 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css +7 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +3 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +4 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm +2 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +5 -5
- 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 +5492 -4341
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js +6 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js +5 -4
- data/public/skyline/javascripts/src/skyline.js +3 -1
- data/public/skyline/javascripts/src/user_preferences.js +49 -0
- data/public/skyline/stylesheets/general.css +149 -47
- data/rails/init.rb +3 -3
- data/test/factories.rb +28 -0
- data/test/integration/media_browser_super_access_test.rb +52 -0
- data/test/integration/media_browser_user_access_test.rb +50 -0
- data/test/integration/user_preferences_test.rb +73 -0
- data/test/mocks/test_content_object.rb +32 -0
- data/test/mocks/test_section.rb +22 -0
- data/test/test_helper.rb +60 -0
- data/test/unit/inline_ref_test.rb +195 -0
- data/test/unit/locales_test.rb +82 -0
- data/test/unit/page_test.rb +204 -0
- data/test/unit/test_content_object_test.rb +69 -0
- data/test/unit/test_section_test.rb +247 -0
- data/test/unit/user_preference_test.rb +123 -0
- data/test/unit/user_test.rb +74 -0
- data/test/user_access_helper.rb +36 -0
- data/vendor/digitpaint/personify/test/fixtures/multiple_tags.txt +8 -0
- data/vendor/digitpaint/personify/test/parse_runner.rb +25 -0
- data/vendor/digitpaint/personify/test/parser_test.rb +109 -0
- data/vendor/digitpaint/personify/test/test_helper.rb +16 -0
- data/vendor/digitpaint/personify/vendor/treetop/.gitignore +5 -0
- data/vendor/mootools-on-rails/lib/mootools_on_rails/mootools_helper.rb +13 -4
- data/vendor/mootools-on-rails/test/mootools_helper_test.rb +138 -0
- data/vendor/mootools-on-rails/test/test_helper.rb +5 -0
- data/vendor/weppos/url_validation.rb +76 -0
- metadata +384 -189
- data/app/controllers/skyline/media_dirs_controller.rb +0 -56
- data/app/controllers/skyline/media_files_controller.rb +0 -87
- data/app/helpers/skyline/presenters/article_list.rb +0 -139
- data/app/observers/skyline/media_file_observer.rb +0 -32
- data/app/views/skyline/media_dirs/_edit.html.erb +0 -25
- data/app/views/skyline/media_dirs/_index.html.erb +0 -14
- data/app/views/skyline/media_dirs/index.html.erb +0 -42
- data/app/views/skyline/media_files/_edit.html.erb +0 -75
- data/app/views/skyline/media_files/_header.html.erb +0 -3
- data/app/views/skyline/media_files/_index.html.erb +0 -51
- data/app/views/skyline/media_files/_new.html.erb +0 -50
- data/db/migrate/20090603104115_prefix_tables_for_skyline.rb +0 -30
- data/lib/skyline/indexer.rb +0 -36
- data/lib/skyline/renderable_scope.rb +0 -27
- data/lib/skyline/rendering/helpers/settings_helper.rb +0 -26
- data/lib/skyline/searchable_item.rb +0 -132
- data/lib/skyline/url_validation.rb +0 -66
- data/public/skyline/images/backgrounds/splitter.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/build.bat +0 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/build.xml +0 -364
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full_jquery.html +0 -94
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/AddOnManager.js +0 -95
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/CommandManager.js +0 -54
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ControlManager.js +0 -489
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Developer.js +0 -91
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Editor.js +0 -2295
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/EditorCommands.js +0 -934
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/EditorManager.js +0 -453
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ForceBlocks.js +0 -644
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/Popup.js +0 -412
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/UndoManager.js +0 -183
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/WindowManager.js +0 -169
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/jquery/adapter.js +0 -240
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/jquery/jquery.tinymce.js +0 -179
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/adapter/prototype/adapter.js +0 -38
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/BlockQuote.js +0 -135
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/CutCopyPaste.js +0 -24
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/InsertHorizontalRule.js +0 -15
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/RemoveFormat.js +0 -173
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/commands/UndoRedo.js +0 -38
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/DOMUtils.js +0 -1823
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Element.js +0 -199
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/EventUtils.js +0 -349
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Range.js +0 -721
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/ScriptLoader.js +0 -351
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Selection.js +0 -747
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Serializer.js +0 -979
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/Sizzle.js +0 -975
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/StringWriter.js +0 -200
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/TridentSelection.js +0 -273
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/dom/XMLWriter.js +0 -155
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/firebug/firebug-lite.js +0 -2518
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/tinymce.js +0 -549
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Button.js +0 -68
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/ColorSplitButton.js +0 -212
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Container.js +0 -56
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Control.js +0 -182
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/DropMenu.js +0 -397
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/ListBox.js +0 -320
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Menu.js +0 -175
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/MenuButton.js +0 -128
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/MenuItem.js +0 -69
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/NativeListBox.js +0 -198
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Separator.js +0 -34
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/SplitButton.js +0 -99
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/ui/Toolbar.js +0 -86
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/Cookie.js +0 -126
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/Dispatcher.js +0 -101
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSON.js +0 -81
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSONP.js +0 -25
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/JSONRequest.js +0 -87
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/URI.js +0 -289
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/util/XHR.js +0 -80
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/classes/xml/Parser.js +0 -126
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/jquery.tinymce.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin_src.js +0 -616
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/blank.htm +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/safari/editor_plugin_src.js +0 -438
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_dev.js +0 -128
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_jquery.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_jquery_src.js +0 -12198
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_prototype.js +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_prototype_src.js +0 -13057
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api.html +0 -18
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api_jquery.html +0 -18
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/api_prototype.html +0 -19
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/basic.html +0 -548
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/crossdomain.html +0 -87
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/css/unit.css +0 -120
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/index.html +0 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/jquery_plugin.html +0 -112
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/js/api.js +0 -1438
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/js/testrunner.js +0 -791
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/main.html +0 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/media.html +0 -221
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/menu.html +0 -22
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/parts.html +0 -90
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/paste.html +0 -132
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/performance.html +0 -152
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/range.html +0 -522
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/removeformat.html +0 -88
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/selection.html +0 -235
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/config.ini +0 -27
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/footer.html +0 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/header.html +0 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/index.php +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/instructions.txt +0 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/logo.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/selectors.list +0 -40
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/style.css +0 -181
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/index.php +0 -112
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/slickspeed.js +0 -147
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/system/template.php +0 -47
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/slickspeed/template.html +0 -2865
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tests/test.xml +0 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/ant-contrib.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/js_build_tools.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnClientAdapter.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnant.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnjavahl.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/svnkit.jar +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/tools/ant/yuicompressor.jar +0 -0
|
@@ -1,644 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* $Id: ForceBlocks.js 1137 2009-05-22 15:13:40Z spocke $
|
|
3
|
-
*
|
|
4
|
-
* @author Moxiecode
|
|
5
|
-
* @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
(function(tinymce) {
|
|
9
|
-
// Shorten names
|
|
10
|
-
var Event, isIE, isGecko, isOpera, each, extend;
|
|
11
|
-
|
|
12
|
-
Event = tinymce.dom.Event;
|
|
13
|
-
isIE = tinymce.isIE;
|
|
14
|
-
isGecko = tinymce.isGecko;
|
|
15
|
-
isOpera = tinymce.isOpera;
|
|
16
|
-
each = tinymce.each;
|
|
17
|
-
extend = tinymce.extend;
|
|
18
|
-
|
|
19
|
-
function isEmpty(n) {
|
|
20
|
-
n = n.innerHTML;
|
|
21
|
-
|
|
22
|
-
n = n.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi, '-'); // Keep these convert them to - chars
|
|
23
|
-
n = n.replace(/<[^>]+>/g, ''); // Remove all tags
|
|
24
|
-
|
|
25
|
-
return n.replace(/[ \t\r\n]+/g, '') == '';
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
/**
|
|
29
|
-
* This is a internal class and no method in this class should be called directly form the out side.
|
|
30
|
-
*/
|
|
31
|
-
tinymce.create('tinymce.ForceBlocks', {
|
|
32
|
-
ForceBlocks : function(ed) {
|
|
33
|
-
var t = this, s = ed.settings, elm;
|
|
34
|
-
|
|
35
|
-
t.editor = ed;
|
|
36
|
-
t.dom = ed.dom;
|
|
37
|
-
elm = (s.forced_root_block || 'p').toLowerCase();
|
|
38
|
-
s.element = elm.toUpperCase();
|
|
39
|
-
|
|
40
|
-
ed.onPreInit.add(t.setup, t);
|
|
41
|
-
|
|
42
|
-
t.reOpera = new RegExp('(\\u00a0| | )<\/' + elm + '>', 'gi');
|
|
43
|
-
t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');
|
|
44
|
-
t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');
|
|
45
|
-
t.reNbsp2BR2 = new RegExp('<%p()([^>]+)>( | )<\\\/%p>|<%p>( | )<\\\/%p>'.replace(/%p/g, elm), 'gi');
|
|
46
|
-
t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
|
|
47
|
-
|
|
48
|
-
function padd(ed, o) {
|
|
49
|
-
if (isOpera)
|
|
50
|
-
o.content = o.content.replace(t.reOpera, '</' + elm + '>');
|
|
51
|
-
|
|
52
|
-
o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');
|
|
53
|
-
|
|
54
|
-
if (!isIE && !isOpera && o.set) {
|
|
55
|
-
// Use instead of BR in padded paragraphs
|
|
56
|
-
o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');
|
|
57
|
-
o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');
|
|
58
|
-
} else
|
|
59
|
-
o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');
|
|
60
|
-
};
|
|
61
|
-
|
|
62
|
-
ed.onBeforeSetContent.add(padd);
|
|
63
|
-
ed.onPostProcess.add(padd);
|
|
64
|
-
|
|
65
|
-
if (s.forced_root_block) {
|
|
66
|
-
ed.onInit.add(t.forceRoots, t);
|
|
67
|
-
ed.onSetContent.add(t.forceRoots, t);
|
|
68
|
-
ed.onBeforeGetContent.add(t.forceRoots, t);
|
|
69
|
-
}
|
|
70
|
-
},
|
|
71
|
-
|
|
72
|
-
setup : function() {
|
|
73
|
-
var t = this, ed = t.editor, s = ed.settings;
|
|
74
|
-
|
|
75
|
-
// Force root blocks when typing and when getting output
|
|
76
|
-
if (s.forced_root_block) {
|
|
77
|
-
ed.onKeyUp.add(t.forceRoots, t);
|
|
78
|
-
ed.onPreProcess.add(t.forceRoots, t);
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
if (s.force_br_newlines) {
|
|
82
|
-
// Force IE to produce BRs on enter
|
|
83
|
-
if (isIE) {
|
|
84
|
-
ed.onKeyPress.add(function(ed, e) {
|
|
85
|
-
var n, s = ed.selection;
|
|
86
|
-
|
|
87
|
-
if (e.keyCode == 13 && s.getNode().nodeName != 'LI') {
|
|
88
|
-
s.setContent('<br id="__" /> ', {format : 'raw'});
|
|
89
|
-
n = ed.dom.get('__');
|
|
90
|
-
n.removeAttribute('id');
|
|
91
|
-
s.select(n);
|
|
92
|
-
s.collapse();
|
|
93
|
-
return Event.cancel(e);
|
|
94
|
-
}
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
return;
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
if (!isIE && s.force_p_newlines) {
|
|
102
|
-
/* ed.onPreProcess.add(function(ed, o) {
|
|
103
|
-
each(ed.dom.select('br', o.node), function(n) {
|
|
104
|
-
var p = n.parentNode;
|
|
105
|
-
|
|
106
|
-
// Replace <p><br /></p> with <p> </p>
|
|
107
|
-
if (p && p.nodeName == 'p' && (p.childNodes.length == 1 || p.lastChild == n)) {
|
|
108
|
-
p.replaceChild(ed.getDoc().createTextNode('\u00a0'), n);
|
|
109
|
-
}
|
|
110
|
-
});
|
|
111
|
-
});*/
|
|
112
|
-
|
|
113
|
-
ed.onKeyPress.add(function(ed, e) {
|
|
114
|
-
if (e.keyCode == 13 && !e.shiftKey) {
|
|
115
|
-
if (!t.insertPara(e))
|
|
116
|
-
Event.cancel(e);
|
|
117
|
-
}
|
|
118
|
-
});
|
|
119
|
-
|
|
120
|
-
if (isGecko) {
|
|
121
|
-
ed.onKeyDown.add(function(ed, e) {
|
|
122
|
-
if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)
|
|
123
|
-
t.backspaceDelete(e, e.keyCode == 8);
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
function ren(rn, na) {
|
|
129
|
-
var ne = ed.dom.create(na);
|
|
130
|
-
|
|
131
|
-
each(rn.attributes, function(a) {
|
|
132
|
-
if (a.specified && a.nodeValue)
|
|
133
|
-
ne.setAttribute(a.nodeName.toLowerCase(), a.nodeValue);
|
|
134
|
-
});
|
|
135
|
-
|
|
136
|
-
each(rn.childNodes, function(n) {
|
|
137
|
-
ne.appendChild(n.cloneNode(true));
|
|
138
|
-
});
|
|
139
|
-
|
|
140
|
-
rn.parentNode.replaceChild(ne, rn);
|
|
141
|
-
|
|
142
|
-
return ne;
|
|
143
|
-
};
|
|
144
|
-
|
|
145
|
-
// Padd empty inline elements within block elements
|
|
146
|
-
// For example: <p><strong><em></em></strong></p> becomes <p><strong><em> </em></strong></p>
|
|
147
|
-
ed.onPreProcess.add(function(ed, o) {
|
|
148
|
-
each(ed.dom.select('p,h1,h2,h3,h4,h5,h6,div', o.node), function(p) {
|
|
149
|
-
if (isEmpty(p)) {
|
|
150
|
-
each(ed.dom.select('span,em,strong,b,i', o.node), function(n) {
|
|
151
|
-
if (!n.hasChildNodes()) {
|
|
152
|
-
n.appendChild(ed.getDoc().createTextNode('\u00a0'));
|
|
153
|
-
return false; // Break the loop one padding is enough
|
|
154
|
-
}
|
|
155
|
-
});
|
|
156
|
-
}
|
|
157
|
-
});
|
|
158
|
-
});
|
|
159
|
-
|
|
160
|
-
// IE specific fixes
|
|
161
|
-
if (isIE) {
|
|
162
|
-
// Replaces IE:s auto generated paragraphs with the specified element name
|
|
163
|
-
if (s.element != 'P') {
|
|
164
|
-
ed.onKeyPress.add(function(ed, e) {
|
|
165
|
-
t.lastElm = ed.selection.getNode().nodeName;
|
|
166
|
-
});
|
|
167
|
-
|
|
168
|
-
ed.onKeyUp.add(function(ed, e) {
|
|
169
|
-
var bl, sel = ed.selection, n = sel.getNode(), b = ed.getBody();
|
|
170
|
-
|
|
171
|
-
if (b.childNodes.length === 1 && n.nodeName == 'P') {
|
|
172
|
-
n = ren(n, s.element);
|
|
173
|
-
sel.select(n);
|
|
174
|
-
sel.collapse();
|
|
175
|
-
ed.nodeChanged();
|
|
176
|
-
} else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {
|
|
177
|
-
bl = ed.dom.getParent(n, 'p');
|
|
178
|
-
|
|
179
|
-
if (bl) {
|
|
180
|
-
ren(bl, s.element);
|
|
181
|
-
ed.nodeChanged();
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
});
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
},
|
|
188
|
-
|
|
189
|
-
find : function(n, t, s) {
|
|
190
|
-
var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, false), c = -1;
|
|
191
|
-
|
|
192
|
-
while (n = w.nextNode()) {
|
|
193
|
-
c++;
|
|
194
|
-
|
|
195
|
-
// Index by node
|
|
196
|
-
if (t == 0 && n == s)
|
|
197
|
-
return c;
|
|
198
|
-
|
|
199
|
-
// Node by index
|
|
200
|
-
if (t == 1 && c == s)
|
|
201
|
-
return n;
|
|
202
|
-
}
|
|
203
|
-
|
|
204
|
-
return -1;
|
|
205
|
-
},
|
|
206
|
-
|
|
207
|
-
forceRoots : function(ed, e) {
|
|
208
|
-
var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF;
|
|
209
|
-
var nx, bl, bp, sp, le, nl = b.childNodes, i, n, eid;
|
|
210
|
-
|
|
211
|
-
// Fix for bug #1863847
|
|
212
|
-
//if (e && e.keyCode == 13)
|
|
213
|
-
// return true;
|
|
214
|
-
|
|
215
|
-
// Wrap non blocks into blocks
|
|
216
|
-
for (i = nl.length - 1; i >= 0; i--) {
|
|
217
|
-
nx = nl[i];
|
|
218
|
-
|
|
219
|
-
// Is text or non block element
|
|
220
|
-
if (nx.nodeType == 3 || (!t.dom.isBlock(nx) && nx.nodeType != 8)) {
|
|
221
|
-
if (!bl) {
|
|
222
|
-
// Create new block but ignore whitespace
|
|
223
|
-
if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {
|
|
224
|
-
// Store selection
|
|
225
|
-
if (si == -2 && r) {
|
|
226
|
-
if (!isIE) {
|
|
227
|
-
// If selection is element then mark it
|
|
228
|
-
if (r.startContainer.nodeType == 1 && (n = r.startContainer.childNodes[r.startOffset]) && n.nodeType == 1) {
|
|
229
|
-
// Save the id of the selected element
|
|
230
|
-
eid = n.getAttribute("id");
|
|
231
|
-
n.setAttribute("id", "__mce");
|
|
232
|
-
} else {
|
|
233
|
-
// If element is inside body, might not be the case in contentEdiable mode
|
|
234
|
-
if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) {
|
|
235
|
-
so = r.startOffset;
|
|
236
|
-
eo = r.endOffset;
|
|
237
|
-
si = t.find(b, 0, r.startContainer);
|
|
238
|
-
ei = t.find(b, 0, r.endContainer);
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
} else {
|
|
242
|
-
tr = d.body.createTextRange();
|
|
243
|
-
tr.moveToElementText(b);
|
|
244
|
-
tr.collapse(1);
|
|
245
|
-
bp = tr.move('character', c) * -1;
|
|
246
|
-
|
|
247
|
-
tr = r.duplicate();
|
|
248
|
-
tr.collapse(1);
|
|
249
|
-
sp = tr.move('character', c) * -1;
|
|
250
|
-
|
|
251
|
-
tr = r.duplicate();
|
|
252
|
-
tr.collapse(0);
|
|
253
|
-
le = (tr.move('character', c) * -1) - sp;
|
|
254
|
-
|
|
255
|
-
si = sp - bp;
|
|
256
|
-
ei = le;
|
|
257
|
-
}
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
bl = ed.dom.create(ed.settings.forced_root_block);
|
|
261
|
-
bl.appendChild(nx.cloneNode(1));
|
|
262
|
-
nx.parentNode.replaceChild(bl, nx);
|
|
263
|
-
}
|
|
264
|
-
} else {
|
|
265
|
-
if (bl.hasChildNodes())
|
|
266
|
-
bl.insertBefore(nx, bl.firstChild);
|
|
267
|
-
else
|
|
268
|
-
bl.appendChild(nx);
|
|
269
|
-
}
|
|
270
|
-
} else
|
|
271
|
-
bl = null; // Time to create new block
|
|
272
|
-
}
|
|
273
|
-
|
|
274
|
-
// Restore selection
|
|
275
|
-
if (si != -2) {
|
|
276
|
-
if (!isIE) {
|
|
277
|
-
bl = b.getElementsByTagName(ed.settings.element)[0];
|
|
278
|
-
r = d.createRange();
|
|
279
|
-
|
|
280
|
-
// Select last location or generated block
|
|
281
|
-
if (si != -1)
|
|
282
|
-
r.setStart(t.find(b, 1, si), so);
|
|
283
|
-
else
|
|
284
|
-
r.setStart(bl, 0);
|
|
285
|
-
|
|
286
|
-
// Select last location or generated block
|
|
287
|
-
if (ei != -1)
|
|
288
|
-
r.setEnd(t.find(b, 1, ei), eo);
|
|
289
|
-
else
|
|
290
|
-
r.setEnd(bl, 0);
|
|
291
|
-
|
|
292
|
-
if (s) {
|
|
293
|
-
s.removeAllRanges();
|
|
294
|
-
s.addRange(r);
|
|
295
|
-
}
|
|
296
|
-
} else {
|
|
297
|
-
try {
|
|
298
|
-
r = s.createRange();
|
|
299
|
-
r.moveToElementText(b);
|
|
300
|
-
r.collapse(1);
|
|
301
|
-
r.moveStart('character', si);
|
|
302
|
-
r.moveEnd('character', ei);
|
|
303
|
-
r.select();
|
|
304
|
-
} catch (ex) {
|
|
305
|
-
// Ignore
|
|
306
|
-
}
|
|
307
|
-
}
|
|
308
|
-
} else if (!isIE && (n = ed.dom.get('__mce'))) {
|
|
309
|
-
// Restore the id of the selected element
|
|
310
|
-
if (eid)
|
|
311
|
-
n.setAttribute('id', eid);
|
|
312
|
-
else
|
|
313
|
-
n.removeAttribute('id');
|
|
314
|
-
|
|
315
|
-
// Move caret before selected element
|
|
316
|
-
r = d.createRange();
|
|
317
|
-
r.setStartBefore(n);
|
|
318
|
-
r.setEndBefore(n);
|
|
319
|
-
se.setRng(r);
|
|
320
|
-
}
|
|
321
|
-
},
|
|
322
|
-
|
|
323
|
-
getParentBlock : function(n) {
|
|
324
|
-
var d = this.dom;
|
|
325
|
-
|
|
326
|
-
return d.getParent(n, d.isBlock);
|
|
327
|
-
},
|
|
328
|
-
|
|
329
|
-
insertPara : function(e) {
|
|
330
|
-
var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;
|
|
331
|
-
var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch, car;
|
|
332
|
-
|
|
333
|
-
// If root blocks are forced then use Operas default behavior since it's really good
|
|
334
|
-
// Removed due to bug: #1853816
|
|
335
|
-
// if (se.forced_root_block && isOpera)
|
|
336
|
-
// return true;
|
|
337
|
-
|
|
338
|
-
// Setup before range
|
|
339
|
-
rb = d.createRange();
|
|
340
|
-
|
|
341
|
-
// If is before the first block element and in body, then move it into first block element
|
|
342
|
-
rb.setStart(s.anchorNode, s.anchorOffset);
|
|
343
|
-
rb.collapse(true);
|
|
344
|
-
|
|
345
|
-
// Setup after range
|
|
346
|
-
ra = d.createRange();
|
|
347
|
-
|
|
348
|
-
// If is before the first block element and in body, then move it into first block element
|
|
349
|
-
ra.setStart(s.focusNode, s.focusOffset);
|
|
350
|
-
ra.collapse(true);
|
|
351
|
-
|
|
352
|
-
// Setup start/end points
|
|
353
|
-
dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
|
|
354
|
-
sn = dir ? s.anchorNode : s.focusNode;
|
|
355
|
-
so = dir ? s.anchorOffset : s.focusOffset;
|
|
356
|
-
en = dir ? s.focusNode : s.anchorNode;
|
|
357
|
-
eo = dir ? s.focusOffset : s.anchorOffset;
|
|
358
|
-
|
|
359
|
-
// If selection is in empty table cell
|
|
360
|
-
if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {
|
|
361
|
-
if (sn.firstChild.nodeName == 'BR')
|
|
362
|
-
dom.remove(sn.firstChild); // Remove BR
|
|
363
|
-
|
|
364
|
-
// Create two new block elements
|
|
365
|
-
if (sn.childNodes.length == 0) {
|
|
366
|
-
ed.dom.add(sn, se.element, null, '<br />');
|
|
367
|
-
aft = ed.dom.add(sn, se.element, null, '<br />');
|
|
368
|
-
} else {
|
|
369
|
-
n = sn.innerHTML;
|
|
370
|
-
sn.innerHTML = '';
|
|
371
|
-
ed.dom.add(sn, se.element, null, n);
|
|
372
|
-
aft = ed.dom.add(sn, se.element, null, '<br />');
|
|
373
|
-
}
|
|
374
|
-
|
|
375
|
-
// Move caret into the last one
|
|
376
|
-
r = d.createRange();
|
|
377
|
-
r.selectNodeContents(aft);
|
|
378
|
-
r.collapse(1);
|
|
379
|
-
ed.selection.setRng(r);
|
|
380
|
-
|
|
381
|
-
return false;
|
|
382
|
-
}
|
|
383
|
-
|
|
384
|
-
// If the caret is in an invalid location in FF we need to move it into the first block
|
|
385
|
-
if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {
|
|
386
|
-
sn = en = sn.firstChild;
|
|
387
|
-
so = eo = 0;
|
|
388
|
-
rb = d.createRange();
|
|
389
|
-
rb.setStart(sn, 0);
|
|
390
|
-
ra = d.createRange();
|
|
391
|
-
ra.setStart(en, 0);
|
|
392
|
-
}
|
|
393
|
-
|
|
394
|
-
// Never use body as start or end node
|
|
395
|
-
sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes
|
|
396
|
-
sn = sn.nodeName == "BODY" ? sn.firstChild : sn;
|
|
397
|
-
en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes
|
|
398
|
-
en = en.nodeName == "BODY" ? en.firstChild : en;
|
|
399
|
-
|
|
400
|
-
// Get start and end blocks
|
|
401
|
-
sb = t.getParentBlock(sn);
|
|
402
|
-
eb = t.getParentBlock(en);
|
|
403
|
-
bn = sb ? sb.nodeName : se.element; // Get block name to create
|
|
404
|
-
|
|
405
|
-
// Return inside list use default browser behavior
|
|
406
|
-
if (t.dom.getParent(sb, 'ol,ul,pre'))
|
|
407
|
-
return true;
|
|
408
|
-
|
|
409
|
-
// If caption or absolute layers then always generate new blocks within
|
|
410
|
-
if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {
|
|
411
|
-
bn = se.element;
|
|
412
|
-
sb = null;
|
|
413
|
-
}
|
|
414
|
-
|
|
415
|
-
// If caption or absolute layers then always generate new blocks within
|
|
416
|
-
if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {
|
|
417
|
-
bn = se.element;
|
|
418
|
-
eb = null;
|
|
419
|
-
}
|
|
420
|
-
|
|
421
|
-
// Use P instead
|
|
422
|
-
if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(dom.getStyle(sb, 'float', 1)))) {
|
|
423
|
-
bn = se.element;
|
|
424
|
-
sb = eb = null;
|
|
425
|
-
}
|
|
426
|
-
|
|
427
|
-
// Setup new before and after blocks
|
|
428
|
-
bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);
|
|
429
|
-
aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);
|
|
430
|
-
|
|
431
|
-
// Remove id from after clone
|
|
432
|
-
aft.removeAttribute('id');
|
|
433
|
-
|
|
434
|
-
// Is header and cursor is at the end, then force paragraph under
|
|
435
|
-
if (/^(H[1-6])$/.test(bn) && sn.nodeValue && so == sn.nodeValue.length)
|
|
436
|
-
aft = ed.dom.create(se.element);
|
|
437
|
-
|
|
438
|
-
// Find start chop node
|
|
439
|
-
n = sc = sn;
|
|
440
|
-
do {
|
|
441
|
-
if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))
|
|
442
|
-
break;
|
|
443
|
-
|
|
444
|
-
sc = n;
|
|
445
|
-
} while ((n = n.previousSibling ? n.previousSibling : n.parentNode));
|
|
446
|
-
|
|
447
|
-
// Find end chop node
|
|
448
|
-
n = ec = en;
|
|
449
|
-
do {
|
|
450
|
-
if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))
|
|
451
|
-
break;
|
|
452
|
-
|
|
453
|
-
ec = n;
|
|
454
|
-
} while ((n = n.nextSibling ? n.nextSibling : n.parentNode));
|
|
455
|
-
|
|
456
|
-
// Place first chop part into before block element
|
|
457
|
-
if (sc.nodeName == bn)
|
|
458
|
-
rb.setStart(sc, 0);
|
|
459
|
-
else
|
|
460
|
-
rb.setStartBefore(sc);
|
|
461
|
-
|
|
462
|
-
rb.setEnd(sn, so);
|
|
463
|
-
bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari
|
|
464
|
-
|
|
465
|
-
// Place secnd chop part within new block element
|
|
466
|
-
try {
|
|
467
|
-
ra.setEndAfter(ec);
|
|
468
|
-
} catch(ex) {
|
|
469
|
-
//console.debug(s.focusNode, s.focusOffset);
|
|
470
|
-
}
|
|
471
|
-
|
|
472
|
-
ra.setStart(en, eo);
|
|
473
|
-
aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari
|
|
474
|
-
|
|
475
|
-
// Create range around everything
|
|
476
|
-
r = d.createRange();
|
|
477
|
-
if (!sc.previousSibling && sc.parentNode.nodeName == bn) {
|
|
478
|
-
r.setStartBefore(sc.parentNode);
|
|
479
|
-
} else {
|
|
480
|
-
if (rb.startContainer.nodeName == bn && rb.startOffset == 0)
|
|
481
|
-
r.setStartBefore(rb.startContainer);
|
|
482
|
-
else
|
|
483
|
-
r.setStart(rb.startContainer, rb.startOffset);
|
|
484
|
-
}
|
|
485
|
-
|
|
486
|
-
if (!ec.nextSibling && ec.parentNode.nodeName == bn)
|
|
487
|
-
r.setEndAfter(ec.parentNode);
|
|
488
|
-
else
|
|
489
|
-
r.setEnd(ra.endContainer, ra.endOffset);
|
|
490
|
-
|
|
491
|
-
// Delete and replace it with new block elements
|
|
492
|
-
r.deleteContents();
|
|
493
|
-
|
|
494
|
-
if (isOpera)
|
|
495
|
-
ed.getWin().scrollTo(0, vp.y);
|
|
496
|
-
|
|
497
|
-
// Never wrap blocks in blocks
|
|
498
|
-
if (bef.firstChild && bef.firstChild.nodeName == bn)
|
|
499
|
-
bef.innerHTML = bef.firstChild.innerHTML;
|
|
500
|
-
|
|
501
|
-
if (aft.firstChild && aft.firstChild.nodeName == bn)
|
|
502
|
-
aft.innerHTML = aft.firstChild.innerHTML;
|
|
503
|
-
|
|
504
|
-
// Padd empty blocks
|
|
505
|
-
if (isEmpty(bef))
|
|
506
|
-
bef.innerHTML = '<br />';
|
|
507
|
-
|
|
508
|
-
function appendStyles(e, en) {
|
|
509
|
-
var nl = [], nn, n, i;
|
|
510
|
-
|
|
511
|
-
e.innerHTML = '';
|
|
512
|
-
|
|
513
|
-
// Make clones of style elements
|
|
514
|
-
if (se.keep_styles) {
|
|
515
|
-
n = en;
|
|
516
|
-
do {
|
|
517
|
-
// We only want style specific elements
|
|
518
|
-
if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(n.nodeName)) {
|
|
519
|
-
nn = n.cloneNode(false);
|
|
520
|
-
dom.setAttrib(nn, 'id', ''); // Remove ID since it needs to be unique
|
|
521
|
-
nl.push(nn);
|
|
522
|
-
}
|
|
523
|
-
} while (n = n.parentNode);
|
|
524
|
-
}
|
|
525
|
-
|
|
526
|
-
// Append style elements to aft
|
|
527
|
-
if (nl.length > 0) {
|
|
528
|
-
for (i = nl.length - 1, nn = e; i >= 0; i--)
|
|
529
|
-
nn = nn.appendChild(nl[i]);
|
|
530
|
-
|
|
531
|
-
// Padd most inner style element
|
|
532
|
-
nl[0].innerHTML = isOpera ? ' ' : '<br />'; // Extra space for Opera so that the caret can move there
|
|
533
|
-
return nl[0]; // Move caret to most inner element
|
|
534
|
-
} else
|
|
535
|
-
e.innerHTML = isOpera ? ' ' : '<br />'; // Extra space for Opera so that the caret can move there
|
|
536
|
-
};
|
|
537
|
-
|
|
538
|
-
// Fill empty afterblook with current style
|
|
539
|
-
if (isEmpty(aft))
|
|
540
|
-
car = appendStyles(aft, en);
|
|
541
|
-
|
|
542
|
-
// Opera needs this one backwards for older versions
|
|
543
|
-
if (isOpera && parseFloat(opera.version()) < 9.5) {
|
|
544
|
-
r.insertNode(bef);
|
|
545
|
-
r.insertNode(aft);
|
|
546
|
-
} else {
|
|
547
|
-
r.insertNode(aft);
|
|
548
|
-
r.insertNode(bef);
|
|
549
|
-
}
|
|
550
|
-
|
|
551
|
-
// Normalize
|
|
552
|
-
aft.normalize();
|
|
553
|
-
bef.normalize();
|
|
554
|
-
|
|
555
|
-
function first(n) {
|
|
556
|
-
return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() || n;
|
|
557
|
-
};
|
|
558
|
-
|
|
559
|
-
// Move cursor and scroll into view
|
|
560
|
-
r = d.createRange();
|
|
561
|
-
r.selectNodeContents(isGecko ? first(car || aft) : car || aft);
|
|
562
|
-
r.collapse(1);
|
|
563
|
-
s.removeAllRanges();
|
|
564
|
-
s.addRange(r);
|
|
565
|
-
|
|
566
|
-
// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs
|
|
567
|
-
y = ed.dom.getPos(aft).y;
|
|
568
|
-
ch = aft.clientHeight;
|
|
569
|
-
|
|
570
|
-
// Is element within viewport
|
|
571
|
-
if (y < vp.y || y + ch > vp.y + vp.h) {
|
|
572
|
-
ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks
|
|
573
|
-
//console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));
|
|
574
|
-
}
|
|
575
|
-
|
|
576
|
-
return false;
|
|
577
|
-
},
|
|
578
|
-
|
|
579
|
-
backspaceDelete : function(e, bs) {
|
|
580
|
-
var t = this, ed = t.editor, b = ed.getBody(), n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn;
|
|
581
|
-
|
|
582
|
-
// The caret sometimes gets stuck in Gecko if you delete empty paragraphs
|
|
583
|
-
// This workaround removes the element by hand and moves the caret to the previous element
|
|
584
|
-
if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {
|
|
585
|
-
if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {
|
|
586
|
-
// Find previous block element
|
|
587
|
-
n = sc;
|
|
588
|
-
while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;
|
|
589
|
-
|
|
590
|
-
if (n) {
|
|
591
|
-
if (sc != b.firstChild) {
|
|
592
|
-
// Find last text node
|
|
593
|
-
w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
|
|
594
|
-
while (tn = w.nextNode())
|
|
595
|
-
n = tn;
|
|
596
|
-
|
|
597
|
-
// Place caret at the end of last text node
|
|
598
|
-
r = ed.getDoc().createRange();
|
|
599
|
-
r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);
|
|
600
|
-
r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);
|
|
601
|
-
se.setRng(r);
|
|
602
|
-
|
|
603
|
-
// Remove the target container
|
|
604
|
-
ed.dom.remove(sc);
|
|
605
|
-
}
|
|
606
|
-
|
|
607
|
-
return Event.cancel(e);
|
|
608
|
-
}
|
|
609
|
-
}
|
|
610
|
-
}
|
|
611
|
-
|
|
612
|
-
// Gecko generates BR elements here and there, we don't like those so lets remove them
|
|
613
|
-
function handler(e) {
|
|
614
|
-
var pr;
|
|
615
|
-
|
|
616
|
-
e = e.target;
|
|
617
|
-
|
|
618
|
-
// A new BR was created in a block element, remove it
|
|
619
|
-
if (e && e.parentNode && e.nodeName == 'BR' && (n = t.getParentBlock(e))) {
|
|
620
|
-
pr = e.previousSibling;
|
|
621
|
-
|
|
622
|
-
Event.remove(b, 'DOMNodeInserted', handler);
|
|
623
|
-
|
|
624
|
-
// Is there whitespace at the end of the node before then we might need the pesky BR
|
|
625
|
-
// to place the caret at a correct location see bug: #2013943
|
|
626
|
-
if (pr && pr.nodeType == 3 && /\s+$/.test(pr.nodeValue))
|
|
627
|
-
return;
|
|
628
|
-
|
|
629
|
-
// Only remove BR elements that got inserted in the middle of the text
|
|
630
|
-
if (e.previousSibling || e.nextSibling)
|
|
631
|
-
ed.dom.remove(e);
|
|
632
|
-
}
|
|
633
|
-
};
|
|
634
|
-
|
|
635
|
-
// Listen for new nodes
|
|
636
|
-
Event._add(b, 'DOMNodeInserted', handler);
|
|
637
|
-
|
|
638
|
-
// Remove listener
|
|
639
|
-
window.setTimeout(function() {
|
|
640
|
-
Event._remove(b, 'DOMNodeInserted', handler);
|
|
641
|
-
}, 1);
|
|
642
|
-
}
|
|
643
|
-
});
|
|
644
|
-
})(tinymce);
|