alchemy_cms 2.0.7 → 2.1.beta1
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -4
- data/.travis.yml +1 -1
- data/Gemfile +7 -2
- data/README.md +6 -6
- data/Rakefile +26 -18
- data/alchemy_cms.gemspec +14 -14
- data/{assets/stylesheets → app/assets/images/alchemy}/Jcrop.gif +0 -0
- data/{assets/images → app/assets/images/alchemy}/ajax_loader.gif +0 -0
- data/{assets/images → app/assets/images/alchemy}/alchemy-logo.png +0 -0
- data/{assets/images → app/assets/images/alchemy}/flags.png +0 -0
- data/{assets/images → app/assets/images/alchemy}/gui/navi-tab.png +0 -0
- data/{assets/images → app/assets/images/alchemy}/gui/shading_90.png +0 -0
- data/{assets/images → app/assets/images/alchemy}/gui/toggle.png +0 -0
- data/{assets/images → app/assets/images/alchemy}/icons.png +0 -0
- data/{assets/images → app/assets/images/alchemy}/image_loader.gif +0 -0
- data/{assets/images → app/assets/images/alchemy}/jquery-sb/select_arrow.gif +0 -0
- data/{assets/images → app/assets/images/alchemy}/jquery-sb/select_arrow_bg.gif +0 -0
- data/{assets/images → app/assets/images/alchemy}/jquery-sb/select_arrow_bg_hover.gif +0 -0
- data/{assets/images → app/assets/images/alchemy}/placeholder.png +0 -0
- data/{assets/images/gui → app/assets/images/alchemy}/shading.png +0 -0
- data/{assets/images → app/assets/images/alchemy}/swfupload/browse_button.png +0 -0
- data/{assets/stylesheets/default/img → app/assets/images/alchemy}/tabs.gif +0 -0
- data/{assets/images/jquery-ui → app/assets/images/alchemy}/ui-icons_666666_256x240.png +0 -0
- data/app/assets/javascripts/alchemy/alchemy.base.js +212 -0
- data/app/assets/javascripts/alchemy/alchemy.buttons.js +36 -0
- data/app/assets/javascripts/alchemy/alchemy.dirty.js +91 -0
- data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +114 -0
- data/{assets/javascripts → app/assets/javascripts/alchemy}/alchemy.element_editor_selector.js +0 -0
- data/{assets/javascripts → app/assets/javascripts/alchemy}/alchemy.growler.js +0 -0
- data/{assets/javascripts → app/assets/javascripts/alchemy}/alchemy.image_cropper.js +0 -0
- data/app/assets/javascripts/alchemy/alchemy.js +26 -0
- data/app/assets/javascripts/alchemy/alchemy.js_extensions.js +17 -0
- data/{assets/javascripts → app/assets/javascripts/alchemy}/alchemy.link_overlay.js +1 -1
- data/{assets/javascripts → app/assets/javascripts/alchemy}/alchemy.page_sorter.js +0 -0
- data/{assets/javascripts → app/assets/javascripts/alchemy}/alchemy.preview.js +0 -0
- data/app/assets/javascripts/alchemy/alchemy.windows.js +438 -0
- data/app/assets/stylesheets/alchemy/_defaults.scss +160 -0
- data/app/assets/stylesheets/alchemy/alchemy.css +9 -0
- data/{assets/stylesheets/alchemy.css → app/assets/stylesheets/alchemy/base.css.scss} +216 -353
- data/{assets/stylesheets/elements.css → app/assets/stylesheets/alchemy/elements.css.scss} +41 -70
- data/{assets/stylesheets/flags.css → app/assets/stylesheets/alchemy/flags.css.scss} +1 -1
- data/{assets/stylesheets/jquery-ui-1.8.7.alchemy.css → app/assets/stylesheets/alchemy/jquery-ui.alchemy.css} +15 -15
- data/{assets/stylesheets/jquery.Jcrop.css → app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss} +3 -3
- data/{assets/stylesheets/jquery.sb.css → app/assets/stylesheets/alchemy/jquery.sb.css.scss} +19 -29
- data/{assets/stylesheets → app/assets/stylesheets/alchemy}/print.css +6 -1
- data/{assets/stylesheets → app/assets/stylesheets/alchemy}/standard_set.css +0 -0
- data/{assets/stylesheets/alchemy_tinymce_content.css → app/assets/stylesheets/alchemy/tinymce_content.css} +0 -0
- data/{assets/stylesheets/alchemy_tinymce_dialog.css → app/assets/stylesheets/alchemy/tinymce_dialog.css} +2 -2
- data/app/controllers/admin/attachments_controller.rb +2 -8
- data/app/controllers/admin/clipboard_controller.rb +2 -2
- data/app/controllers/admin/contents_controller.rb +4 -16
- data/app/controllers/admin/elements_controller.rb +2 -2
- data/app/controllers/admin/essence_audios_controller.rb +0 -3
- data/app/controllers/admin/essence_files_controller.rb +0 -11
- data/app/controllers/admin/essence_flashes_controller.rb +0 -3
- data/app/controllers/admin/essence_pictures_controller.rb +2 -7
- data/app/controllers/admin/essence_videos_controller.rb +0 -3
- data/app/controllers/admin/languages_controller.rb +4 -10
- data/app/controllers/admin/pages_controller.rb +6 -4
- data/app/controllers/admin/pictures_controller.rb +13 -18
- data/app/controllers/admin/trash_controller.rb +0 -5
- data/app/controllers/admin/users_controller.rb +2 -3
- data/app/controllers/alchemy_controller.rb +18 -30
- data/app/controllers/pages_controller.rb +21 -24
- data/app/helpers/admin/elements_helper.rb +5 -0
- data/app/helpers/admin/pages_helper.rb +36 -1
- data/app/helpers/alchemy_helper.rb +39 -17
- data/app/models/attachment.rb +2 -2
- data/app/models/essence_file.rb +1 -1
- data/app/models/page.rb +1 -1
- data/app/sweepers/pages_sweeper.rb +10 -0
- data/app/views/admin/attachments/destroy.js.erb +4 -0
- data/app/views/admin/clipboard/insert.js.erb +12 -19
- data/app/views/admin/contents/create.js.erb +1 -1
- data/app/views/admin/contents/destroy.js.erb +7 -0
- data/app/views/admin/contents/order.js.erb +6 -0
- data/app/views/admin/elements/_element.html.erb +4 -2
- data/app/views/admin/elements/create.js.erb +19 -26
- data/app/views/admin/elements/fold.js.erb +1 -1
- data/app/views/admin/elements/index.html.erb +1 -1
- data/app/views/admin/essence_files/assign.js.erb +8 -0
- data/app/views/admin/essence_pictures/save_link.js.erb +3 -0
- data/app/views/admin/index.html.erb +37 -27
- data/app/views/admin/languages/destroy.js.erb +1 -0
- data/app/views/admin/pages/_page.html.erb +1 -1
- data/app/views/admin/pages/_sitemap.html.erb +1 -1
- data/app/views/admin/pages/edit.html.erb +2 -2
- data/app/views/admin/pages/update.js.erb +1 -1
- data/app/views/admin/partials/_upload_form.html.erb +11 -11
- data/app/views/admin/pictures/archive_overlay.js.erb +1 -0
- data/app/views/admin/pictures/flush.js.erb +2 -0
- data/app/views/admin/pictures/update.js.erb +1 -0
- data/app/views/admin/trash/clear.js.erb +3 -0
- data/app/views/alchemy/error_notice.js.erb +1 -0
- data/app/views/alchemy/permission_denied.js.erb +2 -0
- data/app/views/alchemy/redirect.js.erb +1 -0
- data/app/views/alchemy/remote_errors.js.erb +3 -0
- data/app/views/alchemy/update.js.erb +5 -0
- data/app/views/essences/_essence_file_editor.html.erb +0 -1
- data/app/views/essences/_essence_file_view.html.erb +1 -5
- data/app/views/essences/_essence_picture_tools.html.erb +1 -1
- data/app/views/layouts/alchemy.html.erb +22 -9
- data/app/views/pages/show.rss.builder +1 -1
- data/config/alchemy/elements.yml +0 -5
- data/config/alchemy/page_layouts.yml +1 -1
- data/config/asset_packages.yml +17 -19
- data/config/authorization_rules.rb +1 -0
- data/config/locales/de.yml +0 -1
- data/config/routes.rb +1 -1
- data/lib/alchemy/tinymce.rb +51 -0
- data/lib/alchemy/version.rb +3 -3
- data/lib/alchemy_cms.rb +4 -2
- data/script/rails +6 -0
- data/spec/controllers/admin/clipboard_controller_spec.rb +15 -13
- data/spec/controllers/admin/contents_controller_spec.rb +4 -4
- data/spec/controllers/admin/trash_controller_spec.rb +6 -9
- data/spec/controllers/pages_controller_spec.rb +9 -8
- data/spec/dummy/Rakefile +1 -1
- data/spec/dummy/app/assets/javascripts/application.js +9 -0
- data/spec/dummy/app/assets/stylesheets/application.css +7 -0
- data/spec/dummy/app/mailers/.gitkeep +0 -0
- data/spec/dummy/app/models/.gitkeep +0 -0
- data/spec/dummy/app/views/layouts/application.html.erb +3 -3
- data/spec/dummy/config/application.rb +12 -6
- data/spec/dummy/config/database.yml +3 -0
- data/spec/dummy/config/environments/development.rb +7 -3
- data/spec/dummy/config/environments/production.rb +23 -12
- data/spec/dummy/config/environments/test.rb +5 -1
- data/spec/dummy/config/initializers/secret_token.rb +1 -1
- data/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
- data/spec/dummy/config/locales/en.yml +1 -1
- data/spec/dummy/config/routes.rb +1 -1
- data/spec/dummy/lib/assets/.gitkeep +0 -0
- data/spec/factories.rb +8 -8
- data/spec/helpers/admin/elements_helper_spec.rb +2 -2
- data/spec/helpers/contents_helper_spec.rb +1 -1
- data/spec/helpers/elements_helper_spec.rb +6 -6
- data/spec/helpers/essences_helper_spec.rb +1 -1
- data/spec/helpers/pages_helper_spec.rb +37 -37
- data/spec/integration/pages_controller_spec.rb +29 -26
- data/spec/integration/security_spec.rb +2 -1
- data/spec/models/content_spec.rb +1 -1
- data/spec/models/element_spec.rb +11 -11
- data/spec/models/language_spec.rb +5 -5
- data/spec/models/page_spec.rb +54 -54
- data/spec/models/user_spec.rb +2 -1
- data/spec/routing_spec.rb +1 -1
- data/{assets/javascripts/jquery.js → vendor/assets/javascripts/jquery-1.6.2.min.js} +0 -0
- data/{assets/javascripts/jquery-ui.js → vendor/assets/javascripts/jquery-ui-custom-1.8.16.min.js} +0 -0
- data/{assets/javascripts → vendor/assets/javascripts/jquery_plugins}/jquery.Jcrop.min.js +0 -0
- data/{assets/javascripts → vendor/assets/javascripts/jquery_plugins}/jquery.dialogextend.min.js +7 -7
- data/{assets/javascripts → vendor/assets/javascripts/jquery_plugins}/jquery.in-place-edit.js +0 -0
- data/{assets/javascripts → vendor/assets/javascripts/jquery_plugins}/jquery.sb.min.js +0 -0
- data/{assets/javascripts → vendor/assets/javascripts/jquery_plugins}/jquery.scrollTo-1.4.2-min.js +10 -10
- data/{assets/javascripts → vendor/assets/javascripts/jquery_plugins}/jquery.ui.nestedSortable.js +0 -0
- data/{assets/javascripts → vendor/assets/javascripts/jquery_plugins}/jquery.ui.tabspaging.js +0 -0
- data/{assets → vendor/assets}/javascripts/swfupload/fileprogress.js +202 -202
- data/{assets → vendor/assets}/javascripts/swfupload/handlers.js +171 -171
- data/{assets → vendor/assets}/javascripts/swfupload/queue.js +97 -97
- data/{assets → vendor/assets}/javascripts/swfupload/swfupload.js +980 -980
- data/{assets → vendor/assets}/javascripts/swfupload/swfupload.swf +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/jquery.tinymce.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/langs/de.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/langs/en.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/license.txt +504 -504
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/alchemy_link/editor_plugin.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/alchemy_link/langs/de.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/alchemy_link/langs/en.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/autoresize/editor_plugin.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/fullscreen/editor_plugin.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +110 -110
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/inlinepopups/editor_plugin.js +0 -0
- data/{assets/javascripts/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css → vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.erb} +8 -8
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/inlinepopups/template.htm +387 -387
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/paste/editor_plugin.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/paste/js/pastetext.js +36 -36
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/paste/js/pasteword.js +51 -51
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/paste/langs/de_dlg.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/paste/langs/en_dlg.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/paste/pastetext.htm +26 -26
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/paste/pasteword.htm +21 -21
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/cell.htm +180 -180
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/css/cell.css +16 -16
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/css/row.css +25 -25
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/css/table.css +13 -13
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/editor_plugin.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/js/cell.js +319 -319
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/js/merge_cells.js +27 -27
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/js/row.js +237 -237
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/js/table.js +450 -450
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/langs/de_dlg.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/langs/en_dlg.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/merge_cells.htm +32 -32
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/row.htm +158 -158
- data/{assets → vendor/assets}/javascripts/tiny_mce/plugins/table/table.htm +188 -188
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/about.htm +52 -52
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/anchor.htm +26 -26
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/charmap.htm +51 -51
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/color_picker.htm +74 -74
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/editor_template.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/image.htm +80 -80
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/flash.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/iframe.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/pagebreak.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/quicktime.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/realmedia.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/shockwave.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/trans.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/video.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/img/windowsmedia.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/js/about.js +73 -73
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/js/anchor.js +43 -43
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/js/charmap.js +355 -355
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/js/color_picker.js +329 -329
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/js/image.js +251 -251
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/js/link.js +153 -153
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/js/source_editor.js +56 -56
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/langs/de.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/langs/de_dlg.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/langs/en.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/link.htm +57 -57
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/shortcuts.htm +47 -47
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/content.css +50 -50
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +117 -117
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/img/progress.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +214 -214
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +48 -48
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +117 -117
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +217 -217
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +7 -7
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +5 -5
- data/{assets → vendor/assets}/javascripts/tiny_mce/themes/advanced/source_editor.htm +25 -25
- data/{assets → vendor/assets}/javascripts/tiny_mce/tiny_mce.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/tiny_mce_popup.js +0 -0
- data/{assets → vendor/assets}/javascripts/tiny_mce/utils/editable_selects.js +70 -70
- data/{assets → vendor/assets}/javascripts/tiny_mce/utils/form_utils.js +210 -210
- data/{assets → vendor/assets}/javascripts/tiny_mce/utils/mctabs.js +161 -161
- data/{assets → vendor/assets}/javascripts/tiny_mce/utils/validate.js +252 -252
- metadata +338 -369
- data/app/views/elements/_download_editor.html.erb +0 -1
- data/app/views/elements/_download_view.html.erb +0 -3
- data/assets/javascripts/alchemy.js +0 -903
- data/assets/javascripts/jquery.rails.js +0 -315
- data/assets/stylesheets/ie6.css +0 -18
- data/config/initializers/tinymce_hammer.rb +0 -31
@@ -1,17 +1,17 @@
|
|
1
|
-
/* CSS file for cell dialog in the table plugin */
|
2
|
-
|
3
|
-
.panel_wrapper div.current {
|
4
|
-
height: 200px;
|
5
|
-
}
|
6
|
-
|
7
|
-
.advfield {
|
8
|
-
width: 200px;
|
9
|
-
}
|
10
|
-
|
11
|
-
#action {
|
12
|
-
margin-bottom: 3px;
|
13
|
-
}
|
14
|
-
|
15
|
-
#class {
|
16
|
-
width: 150px;
|
1
|
+
/* CSS file for cell dialog in the table plugin */
|
2
|
+
|
3
|
+
.panel_wrapper div.current {
|
4
|
+
height: 200px;
|
5
|
+
}
|
6
|
+
|
7
|
+
.advfield {
|
8
|
+
width: 200px;
|
9
|
+
}
|
10
|
+
|
11
|
+
#action {
|
12
|
+
margin-bottom: 3px;
|
13
|
+
}
|
14
|
+
|
15
|
+
#class {
|
16
|
+
width: 150px;
|
17
17
|
}
|
@@ -1,25 +1,25 @@
|
|
1
|
-
/* CSS file for row dialog in the table plugin */
|
2
|
-
|
3
|
-
.panel_wrapper div.current {
|
4
|
-
height: 200px;
|
5
|
-
}
|
6
|
-
|
7
|
-
.advfield {
|
8
|
-
width: 200px;
|
9
|
-
}
|
10
|
-
|
11
|
-
#action {
|
12
|
-
margin-bottom: 3px;
|
13
|
-
}
|
14
|
-
|
15
|
-
#rowtype,#align,#valign,#class,#height {
|
16
|
-
width: 150px;
|
17
|
-
}
|
18
|
-
|
19
|
-
#height {
|
20
|
-
width: 50px;
|
21
|
-
}
|
22
|
-
|
23
|
-
.col2 {
|
24
|
-
padding-left: 20px;
|
25
|
-
}
|
1
|
+
/* CSS file for row dialog in the table plugin */
|
2
|
+
|
3
|
+
.panel_wrapper div.current {
|
4
|
+
height: 200px;
|
5
|
+
}
|
6
|
+
|
7
|
+
.advfield {
|
8
|
+
width: 200px;
|
9
|
+
}
|
10
|
+
|
11
|
+
#action {
|
12
|
+
margin-bottom: 3px;
|
13
|
+
}
|
14
|
+
|
15
|
+
#rowtype,#align,#valign,#class,#height {
|
16
|
+
width: 150px;
|
17
|
+
}
|
18
|
+
|
19
|
+
#height {
|
20
|
+
width: 50px;
|
21
|
+
}
|
22
|
+
|
23
|
+
.col2 {
|
24
|
+
padding-left: 20px;
|
25
|
+
}
|
@@ -1,13 +1,13 @@
|
|
1
|
-
/* CSS file for table dialog in the table plugin */
|
2
|
-
|
3
|
-
.panel_wrapper div.current {
|
4
|
-
height: 245px;
|
5
|
-
}
|
6
|
-
|
7
|
-
.advfield {
|
8
|
-
width: 200px;
|
9
|
-
}
|
10
|
-
|
11
|
-
#class {
|
12
|
-
width: 150px;
|
13
|
-
}
|
1
|
+
/* CSS file for table dialog in the table plugin */
|
2
|
+
|
3
|
+
.panel_wrapper div.current {
|
4
|
+
height: 245px;
|
5
|
+
}
|
6
|
+
|
7
|
+
.advfield {
|
8
|
+
width: 200px;
|
9
|
+
}
|
10
|
+
|
11
|
+
#class {
|
12
|
+
width: 150px;
|
13
|
+
}
|
File without changes
|
@@ -1,319 +1,319 @@
|
|
1
|
-
tinyMCEPopup.requireLangPack();
|
2
|
-
|
3
|
-
var ed;
|
4
|
-
|
5
|
-
function init() {
|
6
|
-
ed = tinyMCEPopup.editor;
|
7
|
-
tinyMCEPopup.resizeToInnerSize();
|
8
|
-
|
9
|
-
document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
|
10
|
-
document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
|
11
|
-
document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
|
12
|
-
|
13
|
-
var inst = ed;
|
14
|
-
var tdElm = ed.dom.getParent(ed.selection.getStart(), "td,th");
|
15
|
-
var formObj = document.forms[0];
|
16
|
-
var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));
|
17
|
-
|
18
|
-
// Get table cell data
|
19
|
-
var celltype = tdElm.nodeName.toLowerCase();
|
20
|
-
var align = ed.dom.getAttrib(tdElm, 'align');
|
21
|
-
var valign = ed.dom.getAttrib(tdElm, 'valign');
|
22
|
-
var width = trimSize(getStyle(tdElm, 'width', 'width'));
|
23
|
-
var height = trimSize(getStyle(tdElm, 'height', 'height'));
|
24
|
-
var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
|
25
|
-
var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
|
26
|
-
var className = ed.dom.getAttrib(tdElm, 'class');
|
27
|
-
var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
|
28
|
-
var id = ed.dom.getAttrib(tdElm, 'id');
|
29
|
-
var lang = ed.dom.getAttrib(tdElm, 'lang');
|
30
|
-
var dir = ed.dom.getAttrib(tdElm, 'dir');
|
31
|
-
var scope = ed.dom.getAttrib(tdElm, 'scope');
|
32
|
-
|
33
|
-
// Setup form
|
34
|
-
addClassesToList('class', 'table_cell_styles');
|
35
|
-
TinyMCE_EditableSelects.init();
|
36
|
-
|
37
|
-
if (!ed.dom.hasClass(tdElm, 'mceSelected')) {
|
38
|
-
formObj.bordercolor.value = bordercolor;
|
39
|
-
formObj.bgcolor.value = bgcolor;
|
40
|
-
formObj.backgroundimage.value = backgroundimage;
|
41
|
-
formObj.width.value = width;
|
42
|
-
formObj.height.value = height;
|
43
|
-
formObj.id.value = id;
|
44
|
-
formObj.lang.value = lang;
|
45
|
-
formObj.style.value = ed.dom.serializeStyle(st);
|
46
|
-
selectByValue(formObj, 'align', align);
|
47
|
-
selectByValue(formObj, 'valign', valign);
|
48
|
-
selectByValue(formObj, 'class', className, true, true);
|
49
|
-
selectByValue(formObj, 'celltype', celltype);
|
50
|
-
selectByValue(formObj, 'dir', dir);
|
51
|
-
selectByValue(formObj, 'scope', scope);
|
52
|
-
|
53
|
-
// Resize some elements
|
54
|
-
if (isVisible('backgroundimagebrowser'))
|
55
|
-
document.getElementById('backgroundimage').style.width = '180px';
|
56
|
-
|
57
|
-
updateColor('bordercolor_pick', 'bordercolor');
|
58
|
-
updateColor('bgcolor_pick', 'bgcolor');
|
59
|
-
} else
|
60
|
-
tinyMCEPopup.dom.hide('action');
|
61
|
-
}
|
62
|
-
|
63
|
-
function updateAction() {
|
64
|
-
var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
|
65
|
-
|
66
|
-
if (!AutoValidator.validate(formObj)) {
|
67
|
-
tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
|
68
|
-
return false;
|
69
|
-
}
|
70
|
-
|
71
|
-
tinyMCEPopup.restoreSelection();
|
72
|
-
el = ed.selection.getStart();
|
73
|
-
tdElm = ed.dom.getParent(el, "td,th");
|
74
|
-
trElm = ed.dom.getParent(el, "tr");
|
75
|
-
tableElm = ed.dom.getParent(el, "table");
|
76
|
-
|
77
|
-
// Cell is selected
|
78
|
-
if (ed.dom.hasClass(tdElm, 'mceSelected')) {
|
79
|
-
// Update all selected sells
|
80
|
-
tinymce.each(ed.dom.select('td.mceSelected,th.mceSelected'), function(td) {
|
81
|
-
updateCell(td);
|
82
|
-
});
|
83
|
-
|
84
|
-
ed.addVisual();
|
85
|
-
ed.nodeChanged();
|
86
|
-
inst.execCommand('mceEndUndoLevel');
|
87
|
-
tinyMCEPopup.close();
|
88
|
-
return;
|
89
|
-
}
|
90
|
-
|
91
|
-
switch (getSelectValue(formObj, 'action')) {
|
92
|
-
case "cell":
|
93
|
-
var celltype = getSelectValue(formObj, 'celltype');
|
94
|
-
var scope = getSelectValue(formObj, 'scope');
|
95
|
-
|
96
|
-
function doUpdate(s) {
|
97
|
-
if (s) {
|
98
|
-
updateCell(tdElm);
|
99
|
-
|
100
|
-
ed.addVisual();
|
101
|
-
ed.nodeChanged();
|
102
|
-
inst.execCommand('mceEndUndoLevel');
|
103
|
-
tinyMCEPopup.close();
|
104
|
-
}
|
105
|
-
};
|
106
|
-
|
107
|
-
if (ed.getParam("accessibility_warnings", 1)) {
|
108
|
-
if (celltype == "th" && scope == "")
|
109
|
-
tinyMCEPopup.confirm(ed.getLang('table_dlg.missing_scope', '', true), doUpdate);
|
110
|
-
else
|
111
|
-
doUpdate(1);
|
112
|
-
|
113
|
-
return;
|
114
|
-
}
|
115
|
-
|
116
|
-
updateCell(tdElm);
|
117
|
-
break;
|
118
|
-
|
119
|
-
case "row":
|
120
|
-
var cell = trElm.firstChild;
|
121
|
-
|
122
|
-
if (cell.nodeName != "TD" && cell.nodeName != "TH")
|
123
|
-
cell = nextCell(cell);
|
124
|
-
|
125
|
-
do {
|
126
|
-
cell = updateCell(cell, true);
|
127
|
-
} while ((cell = nextCell(cell)) != null);
|
128
|
-
|
129
|
-
break;
|
130
|
-
|
131
|
-
case "col":
|
132
|
-
var curr, col = 0, cell = trElm.firstChild, rows = tableElm.getElementsByTagName("tr");
|
133
|
-
|
134
|
-
if (cell.nodeName != "TD" && cell.nodeName != "TH")
|
135
|
-
cell = nextCell(cell);
|
136
|
-
|
137
|
-
do {
|
138
|
-
if (cell == tdElm)
|
139
|
-
break;
|
140
|
-
col += cell.getAttribute("colspan");
|
141
|
-
} while ((cell = nextCell(cell)) != null);
|
142
|
-
|
143
|
-
for (var i=0; i<rows.length; i++) {
|
144
|
-
cell = rows[i].firstChild;
|
145
|
-
|
146
|
-
if (cell.nodeName != "TD" && cell.nodeName != "TH")
|
147
|
-
cell = nextCell(cell);
|
148
|
-
|
149
|
-
curr = 0;
|
150
|
-
do {
|
151
|
-
if (curr == col) {
|
152
|
-
cell = updateCell(cell, true);
|
153
|
-
break;
|
154
|
-
}
|
155
|
-
curr += cell.getAttribute("colspan");
|
156
|
-
} while ((cell = nextCell(cell)) != null);
|
157
|
-
}
|
158
|
-
|
159
|
-
break;
|
160
|
-
|
161
|
-
case "all":
|
162
|
-
var rows = tableElm.getElementsByTagName("tr");
|
163
|
-
|
164
|
-
for (var i=0; i<rows.length; i++) {
|
165
|
-
var cell = rows[i].firstChild;
|
166
|
-
|
167
|
-
if (cell.nodeName != "TD" && cell.nodeName != "TH")
|
168
|
-
cell = nextCell(cell);
|
169
|
-
|
170
|
-
do {
|
171
|
-
cell = updateCell(cell, true);
|
172
|
-
} while ((cell = nextCell(cell)) != null);
|
173
|
-
}
|
174
|
-
|
175
|
-
break;
|
176
|
-
}
|
177
|
-
|
178
|
-
ed.addVisual();
|
179
|
-
ed.nodeChanged();
|
180
|
-
inst.execCommand('mceEndUndoLevel');
|
181
|
-
tinyMCEPopup.close();
|
182
|
-
}
|
183
|
-
|
184
|
-
function nextCell(elm) {
|
185
|
-
while ((elm = elm.nextSibling) != null) {
|
186
|
-
if (elm.nodeName == "TD" || elm.nodeName == "TH")
|
187
|
-
return elm;
|
188
|
-
}
|
189
|
-
|
190
|
-
return null;
|
191
|
-
}
|
192
|
-
|
193
|
-
function updateCell(td, skip_id) {
|
194
|
-
var inst = ed;
|
195
|
-
var formObj = document.forms[0];
|
196
|
-
var curCellType = td.nodeName.toLowerCase();
|
197
|
-
var celltype = getSelectValue(formObj, 'celltype');
|
198
|
-
var doc = inst.getDoc();
|
199
|
-
var dom = ed.dom;
|
200
|
-
|
201
|
-
if (!skip_id)
|
202
|
-
dom.setAttrib(td, 'id', formObj.id.value);
|
203
|
-
|
204
|
-
dom.setAttrib(td, 'align', formObj.align.value);
|
205
|
-
dom.setAttrib(td, 'vAlign', formObj.valign.value);
|
206
|
-
dom.setAttrib(td, 'lang', formObj.lang.value);
|
207
|
-
dom.setAttrib(td, 'dir', getSelectValue(formObj, 'dir'));
|
208
|
-
dom.setAttrib(td, 'style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
|
209
|
-
dom.setAttrib(td, 'scope', formObj.scope.value);
|
210
|
-
dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
|
211
|
-
|
212
|
-
// Clear deprecated attributes
|
213
|
-
ed.dom.setAttrib(td, 'width', '');
|
214
|
-
ed.dom.setAttrib(td, 'height', '');
|
215
|
-
ed.dom.setAttrib(td, 'bgColor', '');
|
216
|
-
ed.dom.setAttrib(td, 'borderColor', '');
|
217
|
-
ed.dom.setAttrib(td, 'background', '');
|
218
|
-
|
219
|
-
// Set styles
|
220
|
-
td.style.width = getCSSSize(formObj.width.value);
|
221
|
-
td.style.height = getCSSSize(formObj.height.value);
|
222
|
-
if (formObj.bordercolor.value != "") {
|
223
|
-
td.style.borderColor = formObj.bordercolor.value;
|
224
|
-
td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
|
225
|
-
td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
|
226
|
-
} else
|
227
|
-
td.style.borderColor = '';
|
228
|
-
|
229
|
-
td.style.backgroundColor = formObj.bgcolor.value;
|
230
|
-
|
231
|
-
if (formObj.backgroundimage.value != "")
|
232
|
-
td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
|
233
|
-
else
|
234
|
-
td.style.backgroundImage = '';
|
235
|
-
|
236
|
-
if (curCellType != celltype) {
|
237
|
-
// changing to a different node type
|
238
|
-
var newCell = doc.createElement(celltype);
|
239
|
-
|
240
|
-
for (var c=0; c<td.childNodes.length; c++)
|
241
|
-
newCell.appendChild(td.childNodes[c].cloneNode(1));
|
242
|
-
|
243
|
-
for (var a=0; a<td.attributes.length; a++)
|
244
|
-
ed.dom.setAttrib(newCell, td.attributes[a].name, ed.dom.getAttrib(td, td.attributes[a].name));
|
245
|
-
|
246
|
-
td.parentNode.replaceChild(newCell, td);
|
247
|
-
td = newCell;
|
248
|
-
}
|
249
|
-
|
250
|
-
dom.setAttrib(td, 'style', dom.serializeStyle(dom.parseStyle(td.style.cssText)));
|
251
|
-
|
252
|
-
return td;
|
253
|
-
}
|
254
|
-
|
255
|
-
function changedBackgroundImage() {
|
256
|
-
var formObj = document.forms[0];
|
257
|
-
var st = ed.dom.parseStyle(formObj.style.value);
|
258
|
-
|
259
|
-
st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
|
260
|
-
|
261
|
-
formObj.style.value = ed.dom.serializeStyle(st);
|
262
|
-
}
|
263
|
-
|
264
|
-
function changedSize() {
|
265
|
-
var formObj = document.forms[0];
|
266
|
-
var st = ed.dom.parseStyle(formObj.style.value);
|
267
|
-
|
268
|
-
var width = formObj.width.value;
|
269
|
-
if (width != "")
|
270
|
-
st['width'] = getCSSSize(width);
|
271
|
-
else
|
272
|
-
st['width'] = "";
|
273
|
-
|
274
|
-
var height = formObj.height.value;
|
275
|
-
if (height != "")
|
276
|
-
st['height'] = getCSSSize(height);
|
277
|
-
else
|
278
|
-
st['height'] = "";
|
279
|
-
|
280
|
-
formObj.style.value = ed.dom.serializeStyle(st);
|
281
|
-
}
|
282
|
-
|
283
|
-
function changedColor() {
|
284
|
-
var formObj = document.forms[0];
|
285
|
-
var st = ed.dom.parseStyle(formObj.style.value);
|
286
|
-
|
287
|
-
st['background-color'] = formObj.bgcolor.value;
|
288
|
-
st['border-color'] = formObj.bordercolor.value;
|
289
|
-
|
290
|
-
formObj.style.value = ed.dom.serializeStyle(st);
|
291
|
-
}
|
292
|
-
|
293
|
-
function changedStyle() {
|
294
|
-
var formObj = document.forms[0];
|
295
|
-
var st = ed.dom.parseStyle(formObj.style.value);
|
296
|
-
|
297
|
-
if (st['background-image'])
|
298
|
-
formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
|
299
|
-
else
|
300
|
-
formObj.backgroundimage.value = '';
|
301
|
-
|
302
|
-
if (st['width'])
|
303
|
-
formObj.width.value = trimSize(st['width']);
|
304
|
-
|
305
|
-
if (st['height'])
|
306
|
-
formObj.height.value = trimSize(st['height']);
|
307
|
-
|
308
|
-
if (st['background-color']) {
|
309
|
-
formObj.bgcolor.value = st['background-color'];
|
310
|
-
updateColor('bgcolor_pick','bgcolor');
|
311
|
-
}
|
312
|
-
|
313
|
-
if (st['border-color']) {
|
314
|
-
formObj.bordercolor.value = st['border-color'];
|
315
|
-
updateColor('bordercolor_pick','bordercolor');
|
316
|
-
}
|
317
|
-
}
|
318
|
-
|
319
|
-
tinyMCEPopup.onInit.add(init);
|
1
|
+
tinyMCEPopup.requireLangPack();
|
2
|
+
|
3
|
+
var ed;
|
4
|
+
|
5
|
+
function init() {
|
6
|
+
ed = tinyMCEPopup.editor;
|
7
|
+
tinyMCEPopup.resizeToInnerSize();
|
8
|
+
|
9
|
+
document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
|
10
|
+
document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
|
11
|
+
document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
|
12
|
+
|
13
|
+
var inst = ed;
|
14
|
+
var tdElm = ed.dom.getParent(ed.selection.getStart(), "td,th");
|
15
|
+
var formObj = document.forms[0];
|
16
|
+
var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));
|
17
|
+
|
18
|
+
// Get table cell data
|
19
|
+
var celltype = tdElm.nodeName.toLowerCase();
|
20
|
+
var align = ed.dom.getAttrib(tdElm, 'align');
|
21
|
+
var valign = ed.dom.getAttrib(tdElm, 'valign');
|
22
|
+
var width = trimSize(getStyle(tdElm, 'width', 'width'));
|
23
|
+
var height = trimSize(getStyle(tdElm, 'height', 'height'));
|
24
|
+
var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
|
25
|
+
var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
|
26
|
+
var className = ed.dom.getAttrib(tdElm, 'class');
|
27
|
+
var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
|
28
|
+
var id = ed.dom.getAttrib(tdElm, 'id');
|
29
|
+
var lang = ed.dom.getAttrib(tdElm, 'lang');
|
30
|
+
var dir = ed.dom.getAttrib(tdElm, 'dir');
|
31
|
+
var scope = ed.dom.getAttrib(tdElm, 'scope');
|
32
|
+
|
33
|
+
// Setup form
|
34
|
+
addClassesToList('class', 'table_cell_styles');
|
35
|
+
TinyMCE_EditableSelects.init();
|
36
|
+
|
37
|
+
if (!ed.dom.hasClass(tdElm, 'mceSelected')) {
|
38
|
+
formObj.bordercolor.value = bordercolor;
|
39
|
+
formObj.bgcolor.value = bgcolor;
|
40
|
+
formObj.backgroundimage.value = backgroundimage;
|
41
|
+
formObj.width.value = width;
|
42
|
+
formObj.height.value = height;
|
43
|
+
formObj.id.value = id;
|
44
|
+
formObj.lang.value = lang;
|
45
|
+
formObj.style.value = ed.dom.serializeStyle(st);
|
46
|
+
selectByValue(formObj, 'align', align);
|
47
|
+
selectByValue(formObj, 'valign', valign);
|
48
|
+
selectByValue(formObj, 'class', className, true, true);
|
49
|
+
selectByValue(formObj, 'celltype', celltype);
|
50
|
+
selectByValue(formObj, 'dir', dir);
|
51
|
+
selectByValue(formObj, 'scope', scope);
|
52
|
+
|
53
|
+
// Resize some elements
|
54
|
+
if (isVisible('backgroundimagebrowser'))
|
55
|
+
document.getElementById('backgroundimage').style.width = '180px';
|
56
|
+
|
57
|
+
updateColor('bordercolor_pick', 'bordercolor');
|
58
|
+
updateColor('bgcolor_pick', 'bgcolor');
|
59
|
+
} else
|
60
|
+
tinyMCEPopup.dom.hide('action');
|
61
|
+
}
|
62
|
+
|
63
|
+
function updateAction() {
|
64
|
+
var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
|
65
|
+
|
66
|
+
if (!AutoValidator.validate(formObj)) {
|
67
|
+
tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
|
68
|
+
return false;
|
69
|
+
}
|
70
|
+
|
71
|
+
tinyMCEPopup.restoreSelection();
|
72
|
+
el = ed.selection.getStart();
|
73
|
+
tdElm = ed.dom.getParent(el, "td,th");
|
74
|
+
trElm = ed.dom.getParent(el, "tr");
|
75
|
+
tableElm = ed.dom.getParent(el, "table");
|
76
|
+
|
77
|
+
// Cell is selected
|
78
|
+
if (ed.dom.hasClass(tdElm, 'mceSelected')) {
|
79
|
+
// Update all selected sells
|
80
|
+
tinymce.each(ed.dom.select('td.mceSelected,th.mceSelected'), function(td) {
|
81
|
+
updateCell(td);
|
82
|
+
});
|
83
|
+
|
84
|
+
ed.addVisual();
|
85
|
+
ed.nodeChanged();
|
86
|
+
inst.execCommand('mceEndUndoLevel');
|
87
|
+
tinyMCEPopup.close();
|
88
|
+
return;
|
89
|
+
}
|
90
|
+
|
91
|
+
switch (getSelectValue(formObj, 'action')) {
|
92
|
+
case "cell":
|
93
|
+
var celltype = getSelectValue(formObj, 'celltype');
|
94
|
+
var scope = getSelectValue(formObj, 'scope');
|
95
|
+
|
96
|
+
function doUpdate(s) {
|
97
|
+
if (s) {
|
98
|
+
updateCell(tdElm);
|
99
|
+
|
100
|
+
ed.addVisual();
|
101
|
+
ed.nodeChanged();
|
102
|
+
inst.execCommand('mceEndUndoLevel');
|
103
|
+
tinyMCEPopup.close();
|
104
|
+
}
|
105
|
+
};
|
106
|
+
|
107
|
+
if (ed.getParam("accessibility_warnings", 1)) {
|
108
|
+
if (celltype == "th" && scope == "")
|
109
|
+
tinyMCEPopup.confirm(ed.getLang('table_dlg.missing_scope', '', true), doUpdate);
|
110
|
+
else
|
111
|
+
doUpdate(1);
|
112
|
+
|
113
|
+
return;
|
114
|
+
}
|
115
|
+
|
116
|
+
updateCell(tdElm);
|
117
|
+
break;
|
118
|
+
|
119
|
+
case "row":
|
120
|
+
var cell = trElm.firstChild;
|
121
|
+
|
122
|
+
if (cell.nodeName != "TD" && cell.nodeName != "TH")
|
123
|
+
cell = nextCell(cell);
|
124
|
+
|
125
|
+
do {
|
126
|
+
cell = updateCell(cell, true);
|
127
|
+
} while ((cell = nextCell(cell)) != null);
|
128
|
+
|
129
|
+
break;
|
130
|
+
|
131
|
+
case "col":
|
132
|
+
var curr, col = 0, cell = trElm.firstChild, rows = tableElm.getElementsByTagName("tr");
|
133
|
+
|
134
|
+
if (cell.nodeName != "TD" && cell.nodeName != "TH")
|
135
|
+
cell = nextCell(cell);
|
136
|
+
|
137
|
+
do {
|
138
|
+
if (cell == tdElm)
|
139
|
+
break;
|
140
|
+
col += cell.getAttribute("colspan");
|
141
|
+
} while ((cell = nextCell(cell)) != null);
|
142
|
+
|
143
|
+
for (var i=0; i<rows.length; i++) {
|
144
|
+
cell = rows[i].firstChild;
|
145
|
+
|
146
|
+
if (cell.nodeName != "TD" && cell.nodeName != "TH")
|
147
|
+
cell = nextCell(cell);
|
148
|
+
|
149
|
+
curr = 0;
|
150
|
+
do {
|
151
|
+
if (curr == col) {
|
152
|
+
cell = updateCell(cell, true);
|
153
|
+
break;
|
154
|
+
}
|
155
|
+
curr += cell.getAttribute("colspan");
|
156
|
+
} while ((cell = nextCell(cell)) != null);
|
157
|
+
}
|
158
|
+
|
159
|
+
break;
|
160
|
+
|
161
|
+
case "all":
|
162
|
+
var rows = tableElm.getElementsByTagName("tr");
|
163
|
+
|
164
|
+
for (var i=0; i<rows.length; i++) {
|
165
|
+
var cell = rows[i].firstChild;
|
166
|
+
|
167
|
+
if (cell.nodeName != "TD" && cell.nodeName != "TH")
|
168
|
+
cell = nextCell(cell);
|
169
|
+
|
170
|
+
do {
|
171
|
+
cell = updateCell(cell, true);
|
172
|
+
} while ((cell = nextCell(cell)) != null);
|
173
|
+
}
|
174
|
+
|
175
|
+
break;
|
176
|
+
}
|
177
|
+
|
178
|
+
ed.addVisual();
|
179
|
+
ed.nodeChanged();
|
180
|
+
inst.execCommand('mceEndUndoLevel');
|
181
|
+
tinyMCEPopup.close();
|
182
|
+
}
|
183
|
+
|
184
|
+
function nextCell(elm) {
|
185
|
+
while ((elm = elm.nextSibling) != null) {
|
186
|
+
if (elm.nodeName == "TD" || elm.nodeName == "TH")
|
187
|
+
return elm;
|
188
|
+
}
|
189
|
+
|
190
|
+
return null;
|
191
|
+
}
|
192
|
+
|
193
|
+
function updateCell(td, skip_id) {
|
194
|
+
var inst = ed;
|
195
|
+
var formObj = document.forms[0];
|
196
|
+
var curCellType = td.nodeName.toLowerCase();
|
197
|
+
var celltype = getSelectValue(formObj, 'celltype');
|
198
|
+
var doc = inst.getDoc();
|
199
|
+
var dom = ed.dom;
|
200
|
+
|
201
|
+
if (!skip_id)
|
202
|
+
dom.setAttrib(td, 'id', formObj.id.value);
|
203
|
+
|
204
|
+
dom.setAttrib(td, 'align', formObj.align.value);
|
205
|
+
dom.setAttrib(td, 'vAlign', formObj.valign.value);
|
206
|
+
dom.setAttrib(td, 'lang', formObj.lang.value);
|
207
|
+
dom.setAttrib(td, 'dir', getSelectValue(formObj, 'dir'));
|
208
|
+
dom.setAttrib(td, 'style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
|
209
|
+
dom.setAttrib(td, 'scope', formObj.scope.value);
|
210
|
+
dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
|
211
|
+
|
212
|
+
// Clear deprecated attributes
|
213
|
+
ed.dom.setAttrib(td, 'width', '');
|
214
|
+
ed.dom.setAttrib(td, 'height', '');
|
215
|
+
ed.dom.setAttrib(td, 'bgColor', '');
|
216
|
+
ed.dom.setAttrib(td, 'borderColor', '');
|
217
|
+
ed.dom.setAttrib(td, 'background', '');
|
218
|
+
|
219
|
+
// Set styles
|
220
|
+
td.style.width = getCSSSize(formObj.width.value);
|
221
|
+
td.style.height = getCSSSize(formObj.height.value);
|
222
|
+
if (formObj.bordercolor.value != "") {
|
223
|
+
td.style.borderColor = formObj.bordercolor.value;
|
224
|
+
td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
|
225
|
+
td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
|
226
|
+
} else
|
227
|
+
td.style.borderColor = '';
|
228
|
+
|
229
|
+
td.style.backgroundColor = formObj.bgcolor.value;
|
230
|
+
|
231
|
+
if (formObj.backgroundimage.value != "")
|
232
|
+
td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
|
233
|
+
else
|
234
|
+
td.style.backgroundImage = '';
|
235
|
+
|
236
|
+
if (curCellType != celltype) {
|
237
|
+
// changing to a different node type
|
238
|
+
var newCell = doc.createElement(celltype);
|
239
|
+
|
240
|
+
for (var c=0; c<td.childNodes.length; c++)
|
241
|
+
newCell.appendChild(td.childNodes[c].cloneNode(1));
|
242
|
+
|
243
|
+
for (var a=0; a<td.attributes.length; a++)
|
244
|
+
ed.dom.setAttrib(newCell, td.attributes[a].name, ed.dom.getAttrib(td, td.attributes[a].name));
|
245
|
+
|
246
|
+
td.parentNode.replaceChild(newCell, td);
|
247
|
+
td = newCell;
|
248
|
+
}
|
249
|
+
|
250
|
+
dom.setAttrib(td, 'style', dom.serializeStyle(dom.parseStyle(td.style.cssText)));
|
251
|
+
|
252
|
+
return td;
|
253
|
+
}
|
254
|
+
|
255
|
+
function changedBackgroundImage() {
|
256
|
+
var formObj = document.forms[0];
|
257
|
+
var st = ed.dom.parseStyle(formObj.style.value);
|
258
|
+
|
259
|
+
st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
|
260
|
+
|
261
|
+
formObj.style.value = ed.dom.serializeStyle(st);
|
262
|
+
}
|
263
|
+
|
264
|
+
function changedSize() {
|
265
|
+
var formObj = document.forms[0];
|
266
|
+
var st = ed.dom.parseStyle(formObj.style.value);
|
267
|
+
|
268
|
+
var width = formObj.width.value;
|
269
|
+
if (width != "")
|
270
|
+
st['width'] = getCSSSize(width);
|
271
|
+
else
|
272
|
+
st['width'] = "";
|
273
|
+
|
274
|
+
var height = formObj.height.value;
|
275
|
+
if (height != "")
|
276
|
+
st['height'] = getCSSSize(height);
|
277
|
+
else
|
278
|
+
st['height'] = "";
|
279
|
+
|
280
|
+
formObj.style.value = ed.dom.serializeStyle(st);
|
281
|
+
}
|
282
|
+
|
283
|
+
function changedColor() {
|
284
|
+
var formObj = document.forms[0];
|
285
|
+
var st = ed.dom.parseStyle(formObj.style.value);
|
286
|
+
|
287
|
+
st['background-color'] = formObj.bgcolor.value;
|
288
|
+
st['border-color'] = formObj.bordercolor.value;
|
289
|
+
|
290
|
+
formObj.style.value = ed.dom.serializeStyle(st);
|
291
|
+
}
|
292
|
+
|
293
|
+
function changedStyle() {
|
294
|
+
var formObj = document.forms[0];
|
295
|
+
var st = ed.dom.parseStyle(formObj.style.value);
|
296
|
+
|
297
|
+
if (st['background-image'])
|
298
|
+
formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
|
299
|
+
else
|
300
|
+
formObj.backgroundimage.value = '';
|
301
|
+
|
302
|
+
if (st['width'])
|
303
|
+
formObj.width.value = trimSize(st['width']);
|
304
|
+
|
305
|
+
if (st['height'])
|
306
|
+
formObj.height.value = trimSize(st['height']);
|
307
|
+
|
308
|
+
if (st['background-color']) {
|
309
|
+
formObj.bgcolor.value = st['background-color'];
|
310
|
+
updateColor('bgcolor_pick','bgcolor');
|
311
|
+
}
|
312
|
+
|
313
|
+
if (st['border-color']) {
|
314
|
+
formObj.bordercolor.value = st['border-color'];
|
315
|
+
updateColor('bordercolor_pick','bordercolor');
|
316
|
+
}
|
317
|
+
}
|
318
|
+
|
319
|
+
tinyMCEPopup.onInit.add(init);
|