From 8cf3f60a45f2859194f03132638f5b98f09ff815 Mon Sep 17 00:00:00 2001
From: scyrma
Date: Tue, 10 Jun 2008 10:03:58 +0000
Subject: [PATCH] MDL-14739: Upgrade TinyMCE from 3.0.5 to 3.0.9
---
.../tinymce/jscripts/tiny_mce/langs/en.js | 2 +-
.../tiny_mce/plugins/advhr/js/rule.js | 23 +-
.../plugins/advimage/css/advimage.css | 2 +-
.../tiny_mce/plugins/advimage/image.htm | 3 +-
.../tiny_mce/plugins/advimage/js/image.js | 7 +-
.../tiny_mce/plugins/advlink/js/advlink.js | 56 +-
.../tiny_mce/plugins/bbcode/editor_plugin.js | 2 +-
.../plugins/bbcode/editor_plugin_src.js | 2 +
.../plugins/compat2x/editor_plugin.js | 2 +-
.../plugins/compat2x/editor_plugin_src.js | 3 +
.../plugins/contextmenu/editor_plugin.js | 2 +-
.../plugins/contextmenu/editor_plugin_src.js | 19 +-
.../plugins/fullpage/css/fullpage.css | 4 +
.../plugins/fullpage/editor_plugin.js | 2 +-
.../plugins/fullpage/editor_plugin_src.js | 24 +-
.../plugins/fullscreen/editor_plugin.js | 2 +-
.../plugins/fullscreen/editor_plugin_src.js | 23 +-
.../plugins/inlinepopups/editor_plugin.js | 2 +-
.../plugins/inlinepopups/editor_plugin_src.js | 58 +-
.../inlinepopups/skins/clearlooks2/window.css | 6 +-
.../tiny_mce/plugins/media/css/media.css | 84 +-
.../tiny_mce/plugins/media/editor_plugin.js | 2 +-
.../plugins/media/editor_plugin_src.js | 10 +-
.../tiny_mce/plugins/media/js/media.js | 21 +-
.../jscripts/tiny_mce/plugins/media/media.htm | 2 +-
.../plugins/noneditable/editor_plugin.js | 2 +-
.../plugins/noneditable/editor_plugin_src.js | 6 +
.../plugins/pagebreak/editor_plugin.js | 2 +-
.../plugins/pagebreak/editor_plugin_src.js | 3 +-
.../tiny_mce/plugins/paste/editor_plugin.js | 2 +-
.../plugins/paste/editor_plugin_src.js | 40 +-
.../tiny_mce/plugins/safari/editor_plugin.js | 2 +-
.../plugins/safari/editor_plugin_src.js | 47 +-
.../tiny_mce/plugins/save/editor_plugin.js | 2 +-
.../plugins/save/editor_plugin_src.js | 4 +-
.../plugins/spellchecker/editor_plugin.js | 2 +-
.../plugins/spellchecker/editor_plugin_src.js | 4 +-
.../tiny_mce/plugins/style/editor_plugin.js | 2 +-
.../plugins/style/editor_plugin_src.js | 4 +
.../tiny_mce/plugins/style/js/props.js | 10 +-
.../jscripts/tiny_mce/plugins/table/cell.htm | 3 +-
.../tiny_mce/plugins/table/editor_plugin.js | 2 +-
.../plugins/table/editor_plugin_src.js | 91 +-
.../tiny_mce/plugins/table/js/cell.js | 17 +-
.../tiny_mce/plugins/table/js/merge_cells.js | 4 +-
.../jscripts/tiny_mce/plugins/table/js/row.js | 14 +-
.../tiny_mce/plugins/table/js/table.js | 11 +-
.../jscripts/tiny_mce/plugins/table/row.htm | 3 +-
.../jscripts/tiny_mce/plugins/table/table.htm | 33 +-
.../plugins/template/editor_plugin.js | 2 +-
.../plugins/template/editor_plugin_src.js | 7 +
.../tiny_mce/plugins/template/js/template.js | 14 +-
.../tiny_mce/plugins/template/template.htm | 2 +-
.../plugins/xhtmlxtras/js/element_common.js | 4 +-
.../tiny_mce/themes/advanced/about.htm | 2 +-
.../themes/advanced/editor_template.js | 2 +-
.../themes/advanced/editor_template_src.js | 97 +-
.../tiny_mce/themes/advanced/img/icons.gif | Bin 11532 -> 11505 bytes
.../tiny_mce/themes/advanced/js/anchor.js | 8 +-
.../themes/advanced/js/color_picker.js | 16 +-
.../tiny_mce/themes/advanced/js/image.js | 2 +-
.../tiny_mce/themes/advanced/js/link.js | 45 +-
.../themes/advanced/skins/default/content.css | 7 +
.../themes/advanced/skins/default/ui.css | 22 +-
.../themes/advanced/skins/o2k7/content.css | 7 +
.../themes/advanced/skins/o2k7/ui.css | 16 +-
.../tiny_mce/themes/simple/editor_template.js | 2 +-
.../themes/simple/editor_template_src.js | 2 +-
.../tiny_mce/themes/standard/about.htm | 56 -
.../tiny_mce/themes/standard/anchor.htm | 32 -
.../tiny_mce/themes/standard/charmap.htm | 54 -
.../tiny_mce/themes/standard/color_picker.htm | 76 -
.../themes/standard/editor_template.js | 1 -
.../themes/standard/editor_template_src.js | 1052 ------------
.../tiny_mce/themes/standard/form_utils.js | 199 ---
.../tiny_mce/themes/standard/image.htm | 86 -
.../themes/standard/img/colorpicker.jpg | Bin 3189 -> 0 bytes
.../tiny_mce/themes/standard/img/icons.gif | Bin 11505 -> 0 bytes
.../tiny_mce/themes/standard/js/about.js | 72 -
.../tiny_mce/themes/standard/js/anchor.js | 37 -
.../tiny_mce/themes/standard/js/charmap.js | 325 ----
.../themes/standard/js/color_picker.js | 245 ---
.../tiny_mce/themes/standard/js/image.js | 245 ---
.../tiny_mce/themes/standard/js/link.js | 155 --
.../themes/standard/js/source_editor.js | 62 -
.../tiny_mce/themes/standard/langs/ar.js | 62 -
.../tiny_mce/themes/standard/langs/ar_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/bg.js | 62 -
.../tiny_mce/themes/standard/langs/bg_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/bs.js | 62 -
.../tiny_mce/themes/standard/langs/bs_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/ca.js | 62 -
.../tiny_mce/themes/standard/langs/ca_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/ch.js | 62 -
.../tiny_mce/themes/standard/langs/ch_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/cs.js | 62 -
.../tiny_mce/themes/standard/langs/cs_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/cy.js | 76 -
.../tiny_mce/themes/standard/langs/da.js | 62 -
.../tiny_mce/themes/standard/langs/da_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/de.js | 62 -
.../tiny_mce/themes/standard/langs/de_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/el.js | 62 -
.../tiny_mce/themes/standard/langs/el_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/en.js | 62 -
.../tiny_mce/themes/standard/langs/en_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/es.js | 62 -
.../tiny_mce/themes/standard/langs/es_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/et.js | 62 -
.../tiny_mce/themes/standard/langs/et_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/fa.js | 62 -
.../tiny_mce/themes/standard/langs/fa_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/fi.js | 62 -
.../tiny_mce/themes/standard/langs/fi_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/fr.js | 62 -
.../tiny_mce/themes/standard/langs/fr_ca.js | 64 -
.../tiny_mce/themes/standard/langs/fr_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/he.js | 62 -
.../tiny_mce/themes/standard/langs/he_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/hr.js | 62 -
.../tiny_mce/themes/standard/langs/hr_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/hu.js | 62 -
.../tiny_mce/themes/standard/langs/hu_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/ia.js | 62 -
.../tiny_mce/themes/standard/langs/ia_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/ii.js | 62 -
.../tiny_mce/themes/standard/langs/ii_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/is.js | 76 -
.../tiny_mce/themes/standard/langs/it.js | 62 -
.../tiny_mce/themes/standard/langs/it_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/ja.js | 62 -
.../tiny_mce/themes/standard/langs/ja_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/ko.js | 62 -
.../tiny_mce/themes/standard/langs/ko_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/lt.js | 67 -
.../tiny_mce/themes/standard/langs/lt_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/lv.js | 62 -
.../tiny_mce/themes/standard/langs/lv_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/nb.js | 62 -
.../tiny_mce/themes/standard/langs/nb_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/nl.js | 62 -
.../tiny_mce/themes/standard/langs/nl_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/nn.js | 62 -
.../tiny_mce/themes/standard/langs/nn_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/pl.js | 62 -
.../tiny_mce/themes/standard/langs/pl_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/pt.js | 62 -
.../tiny_mce/themes/standard/langs/pt_br.js | 115 --
.../tiny_mce/themes/standard/langs/pt_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/readme.txt | 4 -
.../tiny_mce/themes/standard/langs/ru.js | 62 -
.../themes/standard/langs/ru_KOI8-R.js | 76 -
.../themes/standard/langs/ru_UTF-8.js | 76 -
.../tiny_mce/themes/standard/langs/ru_dlg.js | 48 -
.../tiny_mce/themes/standard/langs/si.js | 62 -
.../tiny_mce/themes/standard/langs/si_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/sk.js | 62 -
.../tiny_mce/themes/standard/langs/sk_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/sl.js | 63 -
.../tiny_mce/themes/standard/langs/sl_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/sr.js | 62 -
.../tiny_mce/themes/standard/langs/sr_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/sv.js | 60 -
.../tiny_mce/themes/standard/langs/sv_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/tr.js | 62 -
.../tiny_mce/themes/standard/langs/tr_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/tw.js | 62 -
.../tiny_mce/themes/standard/langs/tw_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/uk.js | 64 -
.../tiny_mce/themes/standard/langs/uk_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/vi.js | 62 -
.../tiny_mce/themes/standard/langs/vi_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/zh.js | 62 -
.../tiny_mce/themes/standard/langs/zh_cn.js | 76 -
.../tiny_mce/themes/standard/langs/zh_dlg.js | 51 -
.../tiny_mce/themes/standard/langs/zh_tw.js | 78 -
.../themes/standard/langs/zh_tw_utf8.js | 78 -
.../tiny_mce/themes/standard/link.htm | 64 -
.../themes/standard/skins/default/content.css | 27 -
.../themes/standard/skins/default/dialog.css | 114 --
.../standard/skins/default/img/buttons.png | Bin 3274 -> 0 bytes
.../standard/skins/default/img/items.gif | Bin 70 -> 0 bytes
.../standard/skins/default/img/menu_arrow.gif | Bin 68 -> 0 bytes
.../standard/skins/default/img/menu_check.gif | Bin 70 -> 0 bytes
.../standard/skins/default/img/progress.gif | Bin 1787 -> 0 bytes
.../standard/skins/default/img/tabs.gif | Bin 1326 -> 0 bytes
.../themes/standard/skins/default/ui.css | 215 ---
.../themes/standard/skins/o2k7/content.css | 27 -
.../themes/standard/skins/o2k7/dialog.css | 113 --
.../standard/skins/o2k7/img/button_bg.png | Bin 5859 -> 0 bytes
.../skins/o2k7/img/button_bg_black.png | Bin 3736 -> 0 bytes
.../skins/o2k7/img/button_bg_silver.png | Bin 5358 -> 0 bytes
.../themes/standard/skins/o2k7/ui.css | 215 ---
.../themes/standard/skins/o2k7/ui_black.css | 8 -
.../themes/standard/skins/o2k7/ui_silver.css | 5 -
.../themes/standard/source_editor.htm | 32 -
.../tinymce/jscripts/tiny_mce/tiny_mce.js | 2 +-
.../jscripts/tiny_mce/tiny_mce_popup.js | 11 +-
.../tinymce/jscripts/tiny_mce/tiny_mce_src.js | 1404 ++++++++++++-----
.../tinymce/jscripts/tiny_mce/utils/mctabs.js | 22 +-
.../jscripts/tiny_mce/utils/validate.js | 2 +-
lib/editor/tinymce/xhtml_ruleset.txt | 180 +--
202 files changed, 1724 insertions(+), 9699 deletions(-)
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/about.htm
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/anchor.htm
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/charmap.htm
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/color_picker.htm
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/editor_template.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/editor_template_src.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/form_utils.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/image.htm
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/img/colorpicker.jpg
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/img/icons.gif
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/js/about.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/js/anchor.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/js/charmap.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/js/color_picker.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/js/image.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/js/link.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/js/source_editor.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ar.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ar_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/bg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/bg_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/bs.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/bs_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ca.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ca_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ch.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ch_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/cs.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/cs_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/cy.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/da.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/da_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/de.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/de_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/el.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/el_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/en.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/en_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/es.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/es_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/et.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/et_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/fa.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/fa_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/fi.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/fi_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/fr.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/fr_ca.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/fr_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/he.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/he_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/hr.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/hr_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/hu.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/hu_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ia.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ia_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ii.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ii_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/is.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/it.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/it_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ja.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ja_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ko.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ko_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/lt.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/lt_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/lv.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/lv_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/nb.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/nb_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/nl.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/nl_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/nn.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/nn_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/pl.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/pl_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/pt.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/pt_br.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/pt_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/readme.txt
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ru.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ru_KOI8-R.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ru_UTF-8.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/ru_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/si.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/si_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/sk.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/sk_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/sl.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/sl_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/sr.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/sr_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/sv.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/sv_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/tr.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/tr_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/tw.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/tw_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/uk.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/uk_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/vi.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/vi_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/zh.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/zh_cn.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/zh_dlg.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/zh_tw.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/langs/zh_tw_utf8.js
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/link.htm
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/content.css
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/dialog.css
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/img/buttons.png
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/img/items.gif
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/img/menu_arrow.gif
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/img/menu_check.gif
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/img/progress.gif
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/img/tabs.gif
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/default/ui.css
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/o2k7/content.css
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/o2k7/dialog.css
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/o2k7/img/button_bg.png
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/o2k7/img/button_bg_black.png
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/o2k7/img/button_bg_silver.png
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/o2k7/ui.css
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/o2k7/ui_black.css
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/skins/o2k7/ui_silver.css
delete mode 100644 lib/editor/tinymce/jscripts/tiny_mce/themes/standard/source_editor.htm
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/langs/en.js b/lib/editor/tinymce/jscripts/tiny_mce/langs/en.js
index 744145a92e..8519b4de75 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/langs/en.js
+++ b/lib/editor/tinymce/jscripts/tiny_mce/langs/en.js
@@ -61,7 +61,7 @@ iespell_desc:"Run spell checking",
download:"ieSpell not detected. Do you want to install it now?"
},
advhr:{
-advhr_desc:"Horizontale rule"
+advhr_desc:"Horizontal rule"
},
emotions:{
emotions_desc:"Emotions"
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
index 73ee618d69..b6cbd66c75 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
@@ -3,25 +3,34 @@ var AdvHRDialog = {
var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w;
w = dom.getAttrib(n, 'width');
- f.width.value = w ? parseInt(w) : '';
- f.size.value = dom.getAttrib(n, 'size');
- f.noshade.checked = !!dom.getAttrib(n, 'noshade');
+ f.width.value = w ? parseInt(w) : (dom.getStyle('width') || '');
+ f.size.value = dom.getAttrib(n, 'size') || parseInt(dom.getStyle('height')) || '';
+ f.noshade.checked = !!dom.getAttrib(n, 'noshade') || !!dom.getStyle('border-width');
selectByValue(f, 'width2', w.indexOf('%') != -1 ? '%' : 'px');
},
update : function() {
- var ed = tinyMCEPopup.editor, h, f = document.forms[0];
+ var ed = tinyMCEPopup.editor, h, f = document.forms[0], st = '';
h = ' ';
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
index 4d549a5f81..0a6251a696 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
@@ -3,7 +3,7 @@
.alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;}
.checkbox {border:0;}
.panel_wrapper div.current {height:305px;}
-#prev {margin:0; border:1px solid #000; width:99%; height:150px; overflow:auto;}
+#prev {margin:0; border:1px solid #000; width:428px; height:150px; overflow:auto;}
#align, #classlist {width:150px;}
#width, #height {vertical-align:middle; width:50px; text-align:center;}
#vspace, #hspace, #border {vertical-align:middle; width:30px; text-align:center;}
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
index d773eb2864..dd84083f40 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
@@ -6,6 +6,7 @@
+
@@ -122,7 +123,7 @@
{#class_name}
-
+
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
index 571326485b..0db894ca3a 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
@@ -16,6 +16,7 @@ var ImageDialog = {
this.fillFileList('src_list', 'tinyMCEImageList');
this.fillFileList('over_list', 'tinyMCEImageList');
this.fillFileList('out_list', 'tinyMCEImageList');
+ TinyMCE_EditableSelects.init();
if (n.nodeName == 'IMG') {
nl.src.value = dom.getAttrib(n, 'src');
@@ -27,7 +28,7 @@ var ImageDialog = {
nl.hspace.value = this.getAttrib(n, 'hspace');
nl.border.value = this.getAttrib(n, 'border');
selectByValue(f, 'align', this.getAttrib(n, 'align'));
- selectByValue(f, 'class_list', dom.getAttrib(n, 'class'));
+ selectByValue(f, 'class_list', dom.getAttrib(n, 'class'), true, true);
nl.style.value = dom.getAttrib(n, 'style');
nl.id.value = dom.getAttrib(n, 'id');
nl.dir.value = dom.getAttrib(n, 'dir');
@@ -170,7 +171,7 @@ var ImageDialog = {
if (el && el.nodeName == 'IMG') {
ed.dom.setAttribs(el, args);
} else {
- ed.execCommand('mceInsertContent', false, ' ', {skip_undo : 1});
+ ed.execCommand('mceInsertContent', false, ' ', {skip_undo : 1});
ed.dom.setAttribs('__mce_tmp', args);
ed.dom.setAttrib('__mce_tmp', 'id', '');
ed.undoManager.add();
@@ -380,7 +381,7 @@ var ImageDialog = {
v = f.border.value;
if (v || v == '0') {
if (v == '0')
- img.style.border = '';
+ img.style.border = '0';
else
img.style.border = v + 'px solid black';
}
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
index cdeec360e0..2efc1b731d 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
@@ -14,8 +14,9 @@ function preinit() {
}
function changeClass() {
- var formObj = document.forms[0];
- formObj.classes.value = getSelectValue(formObj, 'classlist');
+ var f = document.forms[0];
+
+ f.classes.value = getSelectValue(f, 'classlist');
}
function init() {
@@ -234,7 +235,7 @@ function parseLink(link) {
regExp += "\\);?";
// Build variable array
- var variables = new Array();
+ var variables = [];
variables["_function"] = fnName;
var variableValues = link.replace(new RegExp(regExp, "gi"), replaceStr).split('');
for (var i=0; i(.*?)<\/a>/gi,"[url=$1]$2[/url]");rep(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");rep(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");rep(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");rep(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");rep(/(.*?)<\/font>/gi,"[color=$1]$2[/color]");rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");rep(/(.*?)<\/font>/gi,"$1");rep(/ /gi,"[img]$1[/img]");rep(/(.*?)<\/span>/gi,"[code]$1[/code]");rep(/(.*?)<\/span>/gi,"[quote]$1[/quote]");rep(/(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");rep(/(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");rep(/(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");rep(/(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");rep(/(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");rep(/(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");rep(/<\/(strong|b)>/gi,"[/b]");rep(/<(strong|b)>/gi,"[b]");rep(/<\/(em|i)>/gi,"[/i]");rep(/<(em|i)>/gi,"[i]");rep(/<\/u>/gi,"[/u]");rep(/(.*?)<\/span>/gi,"[u]$1[/u]");rep(//gi,"[u]");rep(/ /gi,"\n");rep(/ /gi,"\n");rep(/ /gi,"\n");rep(/ /gi,"");rep(/<\/p>/gi,"\n");rep(/ /gi," ");rep(/"/gi,"\"");rep(/</gi,"<");rep(/>/gi,">");rep(/&/gi,"&");return s;},_punbb_bbcode2html:function(s){s=tinymce.trim(s);function rep(re,str){s=s.replace(re,str);};rep(/\n/gi," ");rep(/\[b\]/gi,"");rep(/\[\/b\]/gi," ");rep(/\[i\]/gi,"");rep(/\[\/i\]/gi," ");rep(/\[u\]/gi,"");rep(/\[\/u\]/gi," ");rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2 ");rep(/\[url\](.*?)\[\/url\]/gi,"$1 ");rep(/\[img\](.*?)\[\/img\]/gi," ");rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2 ");rep(/\[code\](.*?)\[\/code\]/gi,"$1 ");rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"$1 ");return s;}});tinymce.PluginManager.add('bbcode',tinymce.plugins.BBCodePlugin);})();
\ No newline at end of file
+(function(){tinymce.create('tinymce.plugins.BBCodePlugin',{init:function(ed,url){var t=this,dialect=ed.getParam('bbcode_dialect','punbb').toLowerCase();ed.onBeforeSetContent.add(function(ed,o){o.content=t['_'+dialect+'_bbcode2html'](o.content);});ed.onPostProcess.add(function(ed,o){if(o.set)o.content=t['_'+dialect+'_bbcode2html'](o.content);if(o.get)o.content=t['_'+dialect+'_html2bbcode'](o.content);});},getInfo:function(){return{longname:'BBCode Plugin',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_punbb_html2bbcode:function(s){s=tinymce.trim(s);function rep(re,str){s=s.replace(re,str);};rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");rep(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");rep(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");rep(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");rep(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");rep(/(.*?)<\/font>/gi,"[color=$1]$2[/color]");rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");rep(/(.*?)<\/font>/gi,"$1");rep(/ /gi,"[img]$1[/img]");rep(/(.*?)<\/span>/gi,"[code]$1[/code]");rep(/(.*?)<\/span>/gi,"[quote]$1[/quote]");rep(/(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");rep(/(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");rep(/(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");rep(/(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");rep(/(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");rep(/(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");rep(/<\/(strong|b)>/gi,"[/b]");rep(/<(strong|b)>/gi,"[b]");rep(/<\/(em|i)>/gi,"[/i]");rep(/<(em|i)>/gi,"[i]");rep(/<\/u>/gi,"[/u]");rep(/(.*?)<\/span>/gi,"[u]$1[/u]");rep(//gi,"[u]");rep(/]*>/gi,"[quote]");rep(/<\/blockquote>/gi,"[/quote]");rep(/ /gi,"\n");rep(/ /gi,"\n");rep(/ /gi,"\n");rep(//gi,"");rep(/<\/p>/gi,"\n");rep(/ /gi," ");rep(/"/gi,"\"");rep(/</gi,"<");rep(/>/gi,">");rep(/&/gi,"&");return s;},_punbb_bbcode2html:function(s){s=tinymce.trim(s);function rep(re,str){s=s.replace(re,str);};rep(/\n/gi," ");rep(/\[b\]/gi,"");rep(/\[\/b\]/gi," ");rep(/\[i\]/gi,"");rep(/\[\/i\]/gi," ");rep(/\[u\]/gi,"");rep(/\[\/u\]/gi," ");rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2 ");rep(/\[url\](.*?)\[\/url\]/gi,"$1 ");rep(/\[img\](.*?)\[\/img\]/gi," ");rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2 ");rep(/\[code\](.*?)\[\/code\]/gi,"$1 ");rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"$1 ");return s;}});tinymce.PluginManager.add('bbcode',tinymce.plugins.BBCodePlugin);})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index b276adad9c..e0268d2718 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -69,6 +69,8 @@
rep(/<\/u>/gi,"[/u]");
rep(/(.*?)<\/span>/gi,"[u]$1[/u]");
rep(//gi,"[u]");
+ rep(/]*>/gi,"[quote]");
+ rep(/<\/blockquote>/gi,"[/quote]");
rep(/ /gi,"\n");
rep(/ /gi,"\n");
rep(/ /gi,"\n");
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js
index 090c94b0bf..02a1da8b42 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/compat2x/editor_plugin.js
@@ -1 +1 @@
-(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,each=tinymce.each,is=tinymce.is;tinymce.create('tinymce.plugins.Compat2x',{getInfo:function(){return{longname:'Compat2x',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/compat2x',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};}});(function(){tinymce.extend(tinyMCE,{addToLang:function(p,l){each(l,function(v,k){tinyMCE.i18n[(tinyMCE.settings.language||'en')+'.'+(p?p+'_':'')+k]=v;});},getInstanceById:function(n){return this.get(n);}});})();(function(){var EditorManager=tinymce.EditorManager;tinyMCE.instances={};tinyMCE.plugins={};tinymce.PluginManager.onAdd.add(function(pm,n,p){tinyMCE.plugins[n]=p;});tinyMCE.majorVersion=tinymce.majorVersion;tinyMCE.minorVersion=tinymce.minorVersion;tinyMCE.releaseDate=tinymce.releaseDate;tinyMCE.baseURL=tinymce.baseURL;tinyMCE.isIE=tinyMCE.isMSIE=tinymce.isIE||tinymce.isOpera;tinyMCE.isMSIE5=tinymce.isIE;tinyMCE.isMSIE5_0=tinymce.isIE;tinyMCE.isMSIE7=tinymce.isIE;tinyMCE.isGecko=tinymce.isGecko;tinyMCE.isSafari=tinymce.isWebKit;tinyMCE.isOpera=tinymce.isOpera;tinyMCE.isMac=false;tinyMCE.isNS7=false;tinyMCE.isNS71=false;tinyMCE.compat=true;TinyMCE_Engine=tinyMCE;tinymce.extend(tinyMCE,{getParam:function(n,dv){return this.activeEditor.getParam(n,dv);},addEvent:function(e,na,f,sc){tinymce.dom.Event.add(e,na,f,sc||this);},getControlHTML:function(n){return EditorManager.activeEditor.controlManager.createControl(n);},loadCSS:function(u){tinymce.DOM.loadCSS(u);},importCSS:function(doc,u){if(doc==document)this.loadCSS(u);else new tinymce.dom.DOMUtils(doc).loadCSS(u);},log:function(){console.debug.apply(console,arguments);},getLang:function(n,dv){var v=EditorManager.activeEditor.getLang(n.replace(/^lang_/g,''),dv);if(/^[0-9\-.]+$/g.test(v))return parseInt(v);return v;},isInstance:function(o){return o!=null&&typeof(o)=="object"&&o.execCommand;},triggerNodeChange:function(){EditorManager.activeEditor.nodeChanged();},regexpReplace:function(in_str,reg_exp,replace_str,opts){var re;if(in_str==null)return in_str;if(typeof(opts)=="undefined")opts='g';re=new RegExp(reg_exp,opts);return in_str.replace(re,replace_str);},trim:function(s){return tinymce.trim(s);},xmlEncode:function(s){return tinymce.DOM.encode(s);},explode:function(s,d){var o=[];tinymce.each(s.split(d),function(v){if(v!='')o.push(v);});return o;},switchClass:function(id,cls){var b;if(/^mceButton/.test(cls)){b=EditorManager.activeEditor.controlManager.get(id);if(!b)return;switch(cls){case"mceButtonNormal":b.setDisabled(false);b.setActive(false);return;case"mceButtonDisabled":b.setDisabled(true);return;case"mceButtonSelected":b.setActive(true);b.setDisabled(false);return;}}},addCSSClass:function(e,n,b){return tinymce.DOM.addClass(e,n,b);},hasCSSClass:function(e,n){return tinymce.DOM.hasClass(e,n);},removeCSSClass:function(e,n){return tinymce.DOM.removeClass(e,n);},getCSSClasses:function(){var cl=EditorManager.activeEditor.dom.getClasses(),o=[];each(cl,function(c){o.push(c['class']);});return o;},setWindowArg:function(n,v){EditorManager.activeEditor.windowManager.params[n]=v;},getWindowArg:function(n,dv){var wm=EditorManager.activeEditor.windowManager,v;v=wm.getParam(n);if(v==='')return'';return v||wm.getFeature(n)||dv;},getParentNode:function(n,f){return this._getDOM().getParent(n,f);},selectElements:function(n,na,f){var i,a=[],nl,x;for(x=0,na=na.split(',');x/i);if(attr&&attr[1]){bdattr=attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);for(i=0,len=bdattr.length;i',sp);t.head=c.substring(0,sp+1);ep=c.indexOf('
\n';t.foot='\n