MDL-14739 upgrade to latest tinymce, full integration with amos is not yet there...
authorPetr Skoda <skodak@moodle.org>
Sun, 4 Jul 2010 20:27:25 +0000 (20:27 +0000)
committerPetr Skoda <skodak@moodle.org>
Sun, 4 Jul 2010 20:27:25 +0000 (20:27 +0000)
348 files changed:
lib/editor/textarea/lib.php
lib/editor/textarea/version.php
lib/editor/tinymce/Popup.js [deleted file]
lib/editor/tinymce/extra/patches/tinymce_form_utils.patch
lib/editor/tinymce/extra/patches/tinymce_lang_string.patch [deleted file]
lib/editor/tinymce/extra/patches/tinymce_plugin_advimage.patch
lib/editor/tinymce/extra/patches/tinymce_strings.patch
lib/editor/tinymce/extra/strings.php
lib/editor/tinymce/extra/tools/compress.cmd [deleted file]
lib/editor/tinymce/extra/tools/compress.sh
lib/editor/tinymce/extra/tools/download_langs.sh
lib/editor/tinymce/extra/tools/update_lang_files.php
lib/editor/tinymce/lang/en/editor_tinymce.php
lib/editor/tinymce/langs/en.js [deleted file]
lib/editor/tinymce/lib.php
lib/editor/tinymce/license.txt [deleted file]
lib/editor/tinymce/module.js
lib/editor/tinymce/plugins/advhr/css/advhr.css [deleted file]
lib/editor/tinymce/plugins/advhr/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/advhr/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/advhr/js/rule.js [deleted file]
lib/editor/tinymce/plugins/advhr/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/advhr/rule.htm [deleted file]
lib/editor/tinymce/plugins/advimage/css/advimage.css [deleted file]
lib/editor/tinymce/plugins/advimage/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/advimage/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/advimage/image.htm [deleted file]
lib/editor/tinymce/plugins/advimage/img/sample.gif [deleted file]
lib/editor/tinymce/plugins/advimage/js/image.js [deleted file]
lib/editor/tinymce/plugins/advimage/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/advlink/css/advlink.css [deleted file]
lib/editor/tinymce/plugins/advlink/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/advlink/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/advlink/js/advlink.js [deleted file]
lib/editor/tinymce/plugins/advlink/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/advlink/link.htm [deleted file]
lib/editor/tinymce/plugins/autoresize/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/autoresize/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/autosave/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/autosave/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/bbcode/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/bbcode/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/compat2x/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/compat2x/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/contextmenu/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/contextmenu/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/directionality/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/directionality/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/emotions/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/emotions/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/emotions/emotions.htm [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-cool.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-cry.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-embarassed.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-foot-in-mouth.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-frown.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-innocent.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-kiss.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-laughing.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-money-mouth.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-sealed.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-smile.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-surprised.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-tongue-out.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-undecided.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-wink.gif [deleted file]
lib/editor/tinymce/plugins/emotions/img/smiley-yell.gif [deleted file]
lib/editor/tinymce/plugins/emotions/js/emotions.js [deleted file]
lib/editor/tinymce/plugins/emotions/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/example/dialog.htm [deleted file]
lib/editor/tinymce/plugins/example/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/example/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/example/img/example.gif [deleted file]
lib/editor/tinymce/plugins/example/js/dialog.js [deleted file]
lib/editor/tinymce/plugins/example/langs/en.js [deleted file]
lib/editor/tinymce/plugins/example/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/fullpage/css/fullpage.css [deleted file]
lib/editor/tinymce/plugins/fullpage/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/fullpage/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/fullpage/fullpage.htm [deleted file]
lib/editor/tinymce/plugins/fullpage/js/fullpage.js [deleted file]
lib/editor/tinymce/plugins/fullpage/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/fullscreen/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/fullscreen/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/fullscreen/fullscreen.htm [deleted file]
lib/editor/tinymce/plugins/iespell/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/iespell/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/inlinepopups/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/inlinepopups/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif [deleted file]
lib/editor/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif [deleted file]
lib/editor/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif [deleted file]
lib/editor/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif [deleted file]
lib/editor/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif [deleted file]
lib/editor/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif [deleted file]
lib/editor/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif [deleted file]
lib/editor/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css [deleted file]
lib/editor/tinymce/plugins/inlinepopups/template.htm [deleted file]
lib/editor/tinymce/plugins/insertdatetime/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/insertdatetime/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/layer/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/layer/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/media/css/content.css [deleted file]
lib/editor/tinymce/plugins/media/css/media.css [deleted file]
lib/editor/tinymce/plugins/media/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/media/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/media/img/flash.gif [deleted file]
lib/editor/tinymce/plugins/media/img/flv_player.swf [deleted file]
lib/editor/tinymce/plugins/media/img/quicktime.gif [deleted file]
lib/editor/tinymce/plugins/media/img/realmedia.gif [deleted file]
lib/editor/tinymce/plugins/media/img/shockwave.gif [deleted file]
lib/editor/tinymce/plugins/media/img/trans.gif [deleted file]
lib/editor/tinymce/plugins/media/img/windowsmedia.gif [deleted file]
lib/editor/tinymce/plugins/media/js/embed.js [deleted file]
lib/editor/tinymce/plugins/media/js/media.js [deleted file]
lib/editor/tinymce/plugins/media/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/media/media.htm [deleted file]
lib/editor/tinymce/plugins/nonbreaking/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/nonbreaking/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/noneditable/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/noneditable/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/pagebreak/css/content.css [deleted file]
lib/editor/tinymce/plugins/pagebreak/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/pagebreak/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/pagebreak/img/pagebreak.gif [deleted file]
lib/editor/tinymce/plugins/pagebreak/img/trans.gif [deleted file]
lib/editor/tinymce/plugins/paste/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/paste/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/paste/js/pastetext.js [deleted file]
lib/editor/tinymce/plugins/paste/js/pasteword.js [deleted file]
lib/editor/tinymce/plugins/paste/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/paste/pastetext.htm [deleted file]
lib/editor/tinymce/plugins/paste/pasteword.htm [deleted file]
lib/editor/tinymce/plugins/preview/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/preview/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/preview/example.html [deleted file]
lib/editor/tinymce/plugins/preview/jscripts/embed.js [deleted file]
lib/editor/tinymce/plugins/preview/preview.html [deleted file]
lib/editor/tinymce/plugins/print/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/print/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/safari/blank.htm [deleted file]
lib/editor/tinymce/plugins/safari/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/safari/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/save/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/save/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/searchreplace/css/searchreplace.css [deleted file]
lib/editor/tinymce/plugins/searchreplace/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/searchreplace/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/searchreplace/js/searchreplace.js [deleted file]
lib/editor/tinymce/plugins/searchreplace/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/searchreplace/searchreplace.htm [deleted file]
lib/editor/tinymce/plugins/spellchecker/changelog [deleted file]
lib/editor/tinymce/plugins/spellchecker/classes/EnchantSpell.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/classes/GoogleSpell.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/classes/PSpell.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/classes/PSpellShell.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/classes/SpellChecker.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/classes/utils/JSON.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/classes/utils/Logger.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/config.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/css/content.css [deleted file]
lib/editor/tinymce/plugins/spellchecker/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/spellchecker/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/spellchecker/img/wline.gif [deleted file]
lib/editor/tinymce/plugins/spellchecker/includes/general.php [deleted file]
lib/editor/tinymce/plugins/spellchecker/rpc.php [deleted file]
lib/editor/tinymce/plugins/style/css/props.css [deleted file]
lib/editor/tinymce/plugins/style/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/style/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/style/js/props.js [deleted file]
lib/editor/tinymce/plugins/style/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/style/props.htm [deleted file]
lib/editor/tinymce/plugins/tabfocus/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/tabfocus/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/table/cell.htm [deleted file]
lib/editor/tinymce/plugins/table/css/cell.css [deleted file]
lib/editor/tinymce/plugins/table/css/row.css [deleted file]
lib/editor/tinymce/plugins/table/css/table.css [deleted file]
lib/editor/tinymce/plugins/table/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/table/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/table/js/cell.js [deleted file]
lib/editor/tinymce/plugins/table/js/merge_cells.js [deleted file]
lib/editor/tinymce/plugins/table/js/row.js [deleted file]
lib/editor/tinymce/plugins/table/js/table.js [deleted file]
lib/editor/tinymce/plugins/table/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/table/merge_cells.htm [deleted file]
lib/editor/tinymce/plugins/table/row.htm [deleted file]
lib/editor/tinymce/plugins/table/table.htm [deleted file]
lib/editor/tinymce/plugins/template/blank.htm [deleted file]
lib/editor/tinymce/plugins/template/css/template.css [deleted file]
lib/editor/tinymce/plugins/template/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/template/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/template/js/template.js [deleted file]
lib/editor/tinymce/plugins/template/langs/en_dlg.js [deleted file]
lib/editor/tinymce/plugins/template/template.htm [deleted file]
lib/editor/tinymce/plugins/visualchars/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/visualchars/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/abbr.htm [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/acronym.htm [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/attributes.htm [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/cite.htm [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/css/attributes.css [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/css/popup.css [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/del.htm [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/editor_plugin.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/editor_plugin_src.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/ins.htm [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/js/abbr.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/js/acronym.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/js/attributes.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/js/cite.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/js/del.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/js/element_common.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/js/ins.js [deleted file]
lib/editor/tinymce/plugins/xhtmlxtras/langs/en_dlg.js [deleted file]
lib/editor/tinymce/readme_moodle.txt
lib/editor/tinymce/settings.php
lib/editor/tinymce/themes/advanced/about.htm [deleted file]
lib/editor/tinymce/themes/advanced/anchor.htm [deleted file]
lib/editor/tinymce/themes/advanced/charmap.htm [deleted file]
lib/editor/tinymce/themes/advanced/color_picker.htm [deleted file]
lib/editor/tinymce/themes/advanced/editor_template.js [deleted file]
lib/editor/tinymce/themes/advanced/editor_template_src.js [deleted file]
lib/editor/tinymce/themes/advanced/image.htm [deleted file]
lib/editor/tinymce/themes/advanced/img/colorpicker.jpg [deleted file]
lib/editor/tinymce/themes/advanced/img/icons.gif [deleted file]
lib/editor/tinymce/themes/advanced/js/about.js [deleted file]
lib/editor/tinymce/themes/advanced/js/anchor.js [deleted file]
lib/editor/tinymce/themes/advanced/js/charmap.js [deleted file]
lib/editor/tinymce/themes/advanced/js/color_picker.js [deleted file]
lib/editor/tinymce/themes/advanced/js/image.js [deleted file]
lib/editor/tinymce/themes/advanced/js/link.js [deleted file]
lib/editor/tinymce/themes/advanced/js/source_editor.js [deleted file]
lib/editor/tinymce/themes/advanced/langs/en.js [deleted file]
lib/editor/tinymce/themes/advanced/langs/en_dlg.js [deleted file]
lib/editor/tinymce/themes/advanced/link.htm [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/content.css [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/dialog.css [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/img/buttons.png [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/img/items.gif [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/img/menu_arrow.gif [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/img/menu_check.gif [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/img/progress.gif [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/img/tabs.gif [deleted file]
lib/editor/tinymce/themes/advanced/skins/default/ui.css [deleted file]
lib/editor/tinymce/themes/advanced/skins/o2k7/content.css [deleted file]
lib/editor/tinymce/themes/advanced/skins/o2k7/dialog.css [deleted file]
lib/editor/tinymce/themes/advanced/skins/o2k7/img/button_bg.png [deleted file]
lib/editor/tinymce/themes/advanced/skins/o2k7/img/button_bg_black.png [deleted file]
lib/editor/tinymce/themes/advanced/skins/o2k7/img/button_bg_silver.png [deleted file]
lib/editor/tinymce/themes/advanced/skins/o2k7/ui.css [deleted file]
lib/editor/tinymce/themes/advanced/skins/o2k7/ui_black.css [deleted file]
lib/editor/tinymce/themes/advanced/skins/o2k7/ui_silver.css [deleted file]
lib/editor/tinymce/themes/advanced/source_editor.htm [deleted file]
lib/editor/tinymce/themes/simple/editor_template.js [deleted file]
lib/editor/tinymce/themes/simple/editor_template_src.js [deleted file]
lib/editor/tinymce/themes/simple/img/icons.gif [deleted file]
lib/editor/tinymce/themes/simple/langs/en.js [deleted file]
lib/editor/tinymce/themes/simple/skins/default/content.css [deleted file]
lib/editor/tinymce/themes/simple/skins/default/ui.css [deleted file]
lib/editor/tinymce/themes/simple/skins/o2k7/content.css [deleted file]
lib/editor/tinymce/themes/simple/skins/o2k7/img/button_bg.png [deleted file]
lib/editor/tinymce/themes/simple/skins/o2k7/ui.css [deleted file]
lib/editor/tinymce/tiny_mce.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/Popup.js
lib/editor/tinymce/tiny_mce/3.3.8/classes/AddOnManager.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/CommandManager.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ControlManager.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/Developer.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/Editor.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/EditorCommands.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/EditorManager.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ForceBlocks.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/Formatter.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/LegacyInput.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/Popup.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/UndoManager.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/WindowManager.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/adapter/jquery/adapter.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/adapter/jquery/jquery.tinymce.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/adapter/prototype/adapter.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/DOMUtils.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/Element.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/EventUtils.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/Range.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/RangeUtils.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/Schema.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/ScriptLoader.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/Selection.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/Serializer.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/Sizzle.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/StringWriter.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/TreeWalker.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/TridentSelection.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/dom/XMLWriter.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/firebug/firebug-lite.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/tinymce.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/Button.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/ColorSplitButton.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/Container.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/Control.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/DropMenu.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/ListBox.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/Menu.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/MenuButton.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/MenuItem.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/NativeListBox.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/Separator.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/SplitButton.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/ui/Toolbar.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/util/Cookie.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/util/Dispatcher.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/util/JSON.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/util/JSONP.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/util/JSONRequest.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/util/URI.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/util/XHR.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/classes/xml/Parser.js [deleted file]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/advimage/css/advimage.css
lib/editor/tinymce/tiny_mce/3.3.8/plugins/advimage/image.htm
lib/editor/tinymce/tiny_mce/3.3.8/plugins/dragmath/dragmath.php [moved from lib/editor/tinymce/plugins/dragmath/dragmath.php with 92% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/dragmath/editor_plugin.js [moved from lib/editor/tinymce/plugins/dragmath/editor_plugin.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/dragmath/editor_plugin_src.js [moved from lib/editor/tinymce/plugins/dragmath/editor_plugin_src.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/dragmath/img/dragmath.gif [moved from lib/editor/tinymce/plugins/dragmath/img/dragmath.gif with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/dragmath/js/dragmath.js [moved from lib/editor/tinymce/plugins/dragmath/js/dragmath.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/dragmath/langs/en_dlg.js [moved from lib/editor/tinymce/plugins/dragmath/langs/en_dlg.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlemedia/css/media.css [moved from lib/editor/tinymce/plugins/moodlemedia/css/media.css with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlemedia/editor_plugin.js [moved from lib/editor/tinymce/plugins/moodlemedia/editor_plugin.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlemedia/editor_plugin_src.js [moved from lib/editor/tinymce/plugins/moodlemedia/editor_plugin_src.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlemedia/img/icon.gif [moved from lib/editor/tinymce/plugins/moodlemedia/img/icon.gif with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlemedia/js/media.js [moved from lib/editor/tinymce/plugins/moodlemedia/js/media.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlemedia/moodlemedia.htm [moved from lib/editor/tinymce/plugins/moodlemedia/moodlemedia.htm with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlenolink/editor_plugin.js [moved from lib/editor/tinymce/plugins/moodlenolink/editor_plugin.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlenolink/editor_plugin_src.js [moved from lib/editor/tinymce/plugins/moodlenolink/editor_plugin_src.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlenolink/img/ed_nolink.gif [moved from lib/editor/tinymce/plugins/moodlenolink/img/ed_nolink.gif with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/plugins/moodlenolink/langs/en.js [moved from lib/editor/tinymce/plugins/moodlenolink/langs/en.js with 100% similarity]
lib/editor/tinymce/tiny_mce/3.3.8/tiny_mce.js
lib/editor/tinymce/tiny_mce/3.3.8/tiny_mce_popup.js
lib/editor/tinymce/tiny_mce/3.3.8/tiny_mce_src.js
lib/editor/tinymce/tiny_mce/3.3.8/utils/form_utils.js
lib/editor/tinymce/tiny_mce_popup.js [deleted file]
lib/editor/tinymce/tiny_mce_src.js [deleted file]
lib/editor/tinymce/utils/editable_selects.js [deleted file]
lib/editor/tinymce/utils/form_utils.js [deleted file]
lib/editor/tinymce/utils/mctabs.js [deleted file]
lib/editor/tinymce/utils/validate.js [deleted file]
lib/editor/tinymce/version.php
lib/thirdpartylibs.xml

index 9e582a1..936de29 100644 (file)
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Failsafe textare editor support.
+ * Failsafe textarea editor support.
  *
- * @package    moodlecore
- * @subpackage editor
+ * @package    editor_textarea
  * @copyright  2009 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
index 5f844d6..6ead9ba 100644 (file)
@@ -18,8 +18,7 @@
 /**
  * Failsafe textare editor support version file.
  *
- * @package    moodlecore
- * @subpackage editor
+ * @package    editor_textarea
  * @copyright  2009 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/lib/editor/tinymce/Popup.js b/lib/editor/tinymce/Popup.js
deleted file mode 100644 (file)
index 15d4df0..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * $Id$
- *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-// Some global instances
-var tinymce = null, tinyMCEPopup, tinyMCE;
-
-/**#@+
- * @class TinyMCE popup/dialog helper class. This gives you easy access to the
- * parent editor instance and a bunch of other things. It's higly recommended
- * that you load this script into your dialogs.
- *
- * @static
- * @member tinyMCEPopup
- */
-tinyMCEPopup = {
-       /**#@+
-        * @method
-        */
-
-       /**
-        * Initializes the popup this will be called automatically.
-        */
-       init : function() {
-               var t = this, w, ti;
-
-               // Find window & API
-               w = t.getWin();
-               tinymce = w.tinymce;
-               tinyMCE = w.tinyMCE;
-               t.editor = tinymce.EditorManager.activeEditor;
-               t.params = t.editor.windowManager.params;
-               t.features = t.editor.windowManager.features;
-
-               // Setup local DOM
-               t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document);
-
-               // Enables you to skip loading the default css
-               if (t.features.popup_css !== false)
-                       t.dom.loadCSS(t.features.popup_css || t.editor.settings.popup_css);
-
-               // Setup on init listeners
-               t.listeners = [];
-               t.onInit = {
-                       add : function(f, s) {
-                               t.listeners.push({func : f, scope : s});
-                       }
-               };
-
-               t.isWindow = !t.getWindowArg('mce_inline');
-               t.id = t.getWindowArg('mce_window_id');
-               t.editor.windowManager.onOpen.dispatch(t.editor.windowManager, window);
-       },
-
-       /**
-        * Returns the reference to the parent window that opened the dialog.
-        *
-        * @return {Window} Reference to the parent window that opened the dialog.
-        */
-       getWin : function() {
-               return window.dialogArguments || opener || parent || top;
-       },
-
-       /**
-        * Returns a window argument/parameter by name.
-        *
-        * @param {String} n Name of the window argument to retrive.
-        * @param {String} dv Optional default value to return.
-        * @return {String} Argument value or default value if it wasn't found.
-        */
-       getWindowArg : function(n, dv) {
-               var v = this.params[n];
-
-               return tinymce.is(v) ? v : dv;
-       },
-
-       /**
-        * Returns a editor parameter/config option value.
-        *
-        * @param {String} n Name of the editor config option to retrive.
-        * @param {String} dv Optional default value to return.
-        * @return {String} Parameter value or default value if it wasn't found.
-        */
-       getParam : function(n, dv) {
-               return this.editor.getParam(n, dv);
-       },
-
-       /**
-        * Returns a language item by key.
-        *
-        * @param {String} n Language item like mydialog.something.
-        * @param {String} dv Optional default value to return.
-        * @return {String} Language value for the item like "my string" or the default value if it wasn't found.
-        */
-       getLang : function(n, dv) {
-               return this.editor.getLang(n, dv);
-       },
-
-       /**
-        * Executed a command on editor that opened the dialog/popup.
-        *
-        * @param {String} cmd Command to execute.
-        * @param {bool} ui Optional boolean value if the UI for the command should be presented or not.
-        * @param {Object} val Optional value to pass with the comman like an URL.
-        * @param {Object} a Optional arguments object.
-        */
-       execCommand : function(cmd, ui, val, a) {
-               a = a || {};
-               a.skip_focus = 1;
-
-               this.restoreSelection();
-               return this.editor.execCommand(cmd, ui, val, a);
-       },
-
-       /**
-        * Resizes the dialog to the inner size of the window. This is needed since various browsers
-        * have different border sizes on windows.
-        */
-       resizeToInnerSize : function() {
-               var t = this, n, b = document.body, vp = t.dom.getViewPort(window), dw, dh;
-
-               dw = t.getWindowArg('mce_width') - vp.w;
-               dh = t.getWindowArg('mce_height') - vp.h;
-
-               if (t.isWindow)
-                       window.resizeBy(dw, dh);
-               else
-                       t.editor.windowManager.resizeBy(dw, dh, t.id);
-       },
-
-       /**
-        * Will executed the specified string when the page has been loaded. This function
-        * was added for compatibility with the 2.x branch.
-        *
-        * @param {String} s String to evalutate on init.
-        */
-       executeOnLoad : function(s) {
-               this.onInit.add(function() {
-                       eval(s);
-               });
-       },
-
-       /**
-        * Stores the current editor selection for later restoration. This can be useful since some browsers
-        * looses it's selection if a control element is selected/focused inside the dialogs.
-        */
-       storeSelection : function() {
-               this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark(1);
-       },
-
-       /**
-        * Restores any stored selection. This can be useful since some browsers
-        * looses it's selection if a control element is selected/focused inside the dialogs.
-        */
-       restoreSelection : function() {
-               var t = tinyMCEPopup;
-
-               if (!t.isWindow && tinymce.isIE)
-                       t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
-       },
-
-       /**
-        * Loads a specific dialog language pack. If you pass in plugin_url as a arugment
-        * when you open the window it will load the <plugin url>/langs/<code>_dlg.js lang pack file.
-        */
-       requireLangPack : function() {
-               return; // not needed in Moodle - we load all lang packs in one request
-               var t = this, u = t.getWindowArg('plugin_url') || t.getWindowArg('theme_url');
-
-               if (u && t.editor.settings.language && t.features.translate_i18n !== false) {
-                       u += '/langs/' + t.editor.settings.language + '_dlg.js';
-
-                       if (!tinymce.ScriptLoader.isDone(u)) {
-                               document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');
-                               tinymce.ScriptLoader.markDone(u);
-                       }
-               }
-       },
-
-       /**
-        * Executes a color picker on the specified element id. When the user
-        * then selects a color it will be set as the value of the specified element.
-        *
-        * @param {DOMEvent} e DOM event object.
-        * @param {string} element_id Element id to be filled with the color value from the picker.
-        */
-       pickColor : function(e, element_id) {
-               this.execCommand('mceColorPicker', true, {
-                       color : document.getElementById(element_id).value,
-                       func : function(c) {
-                               document.getElementById(element_id).value = c;
-
-                               try {
-                                       document.getElementById(element_id).onchange();
-                               } catch (ex) {
-                                       // Try fire event, ignore errors
-                               }
-                       }
-               });
-       },
-
-       /**
-        * Opens a filebrowser/imagebrowser this will set the output value from
-        * the browser as a value on the specified element.
-        *
-        * @param {string} element_id Id of the element to set value in.
-        * @param {string} type Type of browser to open image/file/flash.
-        * @param {string} option Option name to get the file_broswer_callback function name from.
-        */
-       openBrowser : function(element_id, type, option) {
-               tinyMCEPopup.restoreSelection();
-               this.editor.execCallback('file_browser_callback', element_id, document.getElementById(element_id).value, type, window);
-       },
-
-       /**
-        * Creates a confirm dialog. Please don't use the blocking behavior of this
-        * native version use the callback method instead then it can be extended.
-        *
-        * @param {String} t Title for the new confirm dialog.
-        * @param {function} cb Callback function to be executed after the user has selected ok or cancel.
-        * @param {Object} s Optional scope to execute the callback in.
-        */
-       confirm : function(t, cb, s) {
-               this.editor.windowManager.confirm(t, cb, s, window);
-       },
-
-       /**
-        * Creates a alert dialog. Please don't use the blocking behavior of this
-        * native version use the callback method instead then it can be extended.
-        *
-        * @param {String} t Title for the new alert dialog.
-        * @param {function} cb Callback function to be executed after the user has selected ok.
-        * @param {Object} s Optional scope to execute the callback in.
-        */
-       alert : function(tx, cb, s) {
-               this.editor.windowManager.alert(tx, cb, s, window);
-       },
-
-       /**
-        * Closes the current window.
-        */
-       close : function() {
-               var t = this;
-
-               // To avoid domain relaxing issue in Opera
-               function close() {
-                       t.editor.windowManager.close(window);
-                       tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
-               };
-
-               if (tinymce.isOpera)
-                       t.getWin().setTimeout(close, 0);
-               else
-                       close();
-       },
-
-       // Internal functions   
-
-       _restoreSelection : function() {
-               var e = window.event.srcElement;
-
-               if (e.nodeName == 'INPUT' && (e.type == 'submit' || e.type == 'button'))
-                       tinyMCEPopup.restoreSelection();
-       },
-
-/*     _restoreSelection : function() {
-               var e = window.event.srcElement;
-
-               // If user focus a non text input or textarea
-               if ((e.nodeName != 'INPUT' && e.nodeName != 'TEXTAREA') || e.type != 'text')
-                       tinyMCEPopup.restoreSelection();
-       },*/
-
-       _onDOMLoaded : function() {
-               var t = tinyMCEPopup, ti = document.title, bm, h, nv;
-
-               if (t.domLoaded)
-                       return;
-
-               t.domLoaded = 1;
-
-               // Translate page
-               if (t.features.translate_i18n !== false) {
-                       h = document.body.innerHTML;
-
-                       // Replace a=x with a="x" in IE
-                       if (tinymce.isIE)
-                               h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"')
-
-                       document.dir = t.editor.getParam('directionality','');
-
-                       if ((nv = t.editor.translate(h)) && nv != h)
-                               document.body.innerHTML = nv;
-
-                       if ((nv = t.editor.translate(ti)) && nv != ti)
-                               document.title = ti = nv;
-               }
-
-               document.body.style.display = '';
-
-               // Restore selection in IE when focus is placed on a non textarea or input element of the type text
-               if (tinymce.isIE) {
-                       document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection);
-
-                       // Add base target element for it since it would fail with modal dialogs
-                       t.dom.add(t.dom.select('head')[0], 'base', {target : '_self'});
-               }
-
-               t.restoreSelection();
-               t.resizeToInnerSize();
-
-               // Set inline title
-               if (!t.isWindow)
-                       t.editor.windowManager.setTitle(window, ti);
-               else
-                       window.focus();
-
-               if (!tinymce.isIE && !t.isWindow) {
-                       tinymce.dom.Event._add(document, 'focus', function() {
-                               t.editor.windowManager.focus(t.id)
-                       });
-               }
-
-               // Patch for accessibility
-               tinymce.each(t.dom.select('select'), function(e) {
-                       e.onkeydown = tinyMCEPopup._accessHandler;
-               });
-
-               // Call onInit
-               // Init must be called before focus so the selection won't get lost by the focus call
-               tinymce.each(t.listeners, function(o) {
-                       o.func.call(o.scope, t.editor);
-               });
-
-               // Move focus to window
-               if (t.getWindowArg('mce_auto_focus', true)) {
-                       window.focus();
-
-                       // Focus element with mceFocus class
-                       tinymce.each(document.forms, function(f) {
-                               tinymce.each(f.elements, function(e) {
-                                       if (t.dom.hasClass(e, 'mceFocus') && !e.disabled) {
-                                               e.focus();
-                                               return false; // Break loop
-                                       }
-                               });
-                       });
-               }
-
-               document.onkeyup = tinyMCEPopup._closeWinKeyHandler;
-       },
-
-       _accessHandler : function(e) {
-               e = e || window.event;
-
-               if (e.keyCode == 13 || e.keyCode == 32) {
-                       e = e.target || e.srcElement;
-
-                       if (e.onchange)
-                               e.onchange();
-
-                       return tinymce.dom.Event.cancel(e);
-               }
-       },
-
-       _closeWinKeyHandler : function(e) {
-               e = e || window.event;
-
-               if (e.keyCode == 27)
-                       tinyMCEPopup.close();
-       },
-
-       _wait : function() {
-               // Use IE method
-               if (document.attachEvent) {
-                       document.attachEvent("onreadystatechange", function() {
-                               if (document.readyState === "complete") {
-                                       document.detachEvent("onreadystatechange", arguments.callee);
-                                       tinyMCEPopup._onDOMLoaded();
-                               }
-                       });
-
-                       if (document.documentElement.doScroll && window == window.top) {
-                               (function() {
-                                       if (tinyMCEPopup.domLoaded)
-                                               return;
-
-                                       try {
-                                               // If IE is used, use the trick by Diego Perini
-                                               // http://javascript.nwbox.com/IEContentLoaded/
-                                               document.documentElement.doScroll("left");
-                                       } catch (ex) {
-                                               setTimeout(arguments.callee, 0);
-                                               return;
-                                       }
-
-                                       tinyMCEPopup._onDOMLoaded();
-                               })();
-                       }
-
-                       document.attachEvent('onload', tinyMCEPopup._onDOMLoaded);
-               } else if (document.addEventListener) {
-                       window.addEventListener('DOMContentLoaded', tinyMCEPopup._onDOMLoaded, false);
-                       window.addEventListener('load', tinyMCEPopup._onDOMLoaded, false);
-               }
-       }
-};
-
-tinyMCEPopup.init();
-tinyMCEPopup._wait(); // Wait for DOM Content Loaded
index 89b10d0..9dee09c 100644 (file)
@@ -1,17 +1,17 @@
-Index: lib/editor/tinymce/utils/form_utils.js
+Index: form_utils.js
 ===================================================================
-RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/utils/form_utils.js,v
+RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/tiny_mce/3.3.8/utils/form_utils.js,v
 retrieving revision 1.1
 diff -u -r1.1 form_utils.js
---- lib/editor/tinymce/utils/form_utils.js     16 May 2009 20:54:46 -0000      1.1
-+++ lib/editor/tinymce/utils/form_utils.js     10 Nov 2009 08:06:02 -0000
-@@ -48,9 +48,21 @@
-       if (!cb)
-               return "";
+--- form_utils.js   4 Jul 2010 19:22:17 -0000   1.1
++++ form_utils.js   4 Jul 2010 20:10:43 -0000
+@@ -49,9 +49,21 @@
+    if (!cb)
+        return "";
  
--      html = "";
--      html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
--      html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
+-   html = "";
+-   html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
+-   html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
 +    html = "";
 +    if (id=='filebrowser') {
 +        // for moodlemedia plugin
@@ -28,14 +28,14 @@ diff -u -r1.1 form_utils.js
 +        html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
 +    }
  
-       return html;
+    return html;
  }
-@@ -58,7 +70,7 @@
+@@ -59,7 +71,7 @@
  function openBrowser(img_id, target_form_element, type, option) {
-       var img = document.getElementById(img_id);
+    var img = document.getElementById(img_id);
  
--      if (img.className != "mceButtonDisabled")
-+      if (!img || img.className != "mceButtonDisabled")
-               tinyMCEPopup.openBrowser(target_form_element, type, option);
+-   if (img.className != "mceButtonDisabled")
++   if (!img || img.className != "mceButtonDisabled")
+        tinyMCEPopup.openBrowser(target_form_element, type, option);
  }
  
diff --git a/lib/editor/tinymce/extra/patches/tinymce_lang_string.patch b/lib/editor/tinymce/extra/patches/tinymce_lang_string.patch
deleted file mode 100644 (file)
index 25fc3e2..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: lang/en/editor_tinymce.php
-===================================================================
-RCS file: /cvsroot/moodle/moodle/lang/en/editor_tinymce.php,v
-retrieving revision 1.7
-diff -u -r1.7 editor_tinymce.php
---- lang/en/editor_tinymce.php 19 Jul 2009 13:05:24 -0000      1.7
-+++ lang/en/editor_tinymce.php 10 Nov 2009 08:09:43 -0000
-@@ -234,6 +234,8 @@
- $string['autosave:unload_msg'] = 'The changes you made will be lost if you navigate away from this page.';
- $string['common:apply'] = 'Apply';
- $string['common:browse'] = 'Browse';
-+$string['common:browsemedia'] = 'Find or upload a sound, video or applet';
-+$string['common:browseimage'] = 'Find or upload an image';
- $string['common:cancel'] = 'Cancel';
- $string['common:class_name'] = 'Class';
- $string['common:clipboard_msg'] = 'Copy/Cut/Paste is not available in Mozilla and Firefox.\\nDo you want more information about this issue?';
-@@ -414,6 +416,7 @@
- $string['media_dlg:enablejavascript'] = 'Enable JavaScript';
- $string['media_dlg:endtime'] = 'End time';
- $string['media_dlg:file'] = 'File/URL';
-+$string['media_dlg:filename'] = 'Filename';
- $string['media_dlg:flash_options'] = 'Flash options';
- $string['media_dlg:flashvars'] = 'Flashvars';
- $string['media_dlg:flv_autostart'] = 'Auto start';
index 2ae9fcb..207b6e2 100644 (file)
@@ -1,68 +1,10 @@
-Index: lib/editor/tinymce/plugins/advimage/image.htm
+Index: css/advimage.css
 ===================================================================
-RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/plugins/advimage/image.htm,v
-retrieving revision 1.1
-diff -u -r1.1 image.htm
---- lib/editor/tinymce/plugins/advimage/image.htm      16 May 2009 20:53:41 -0000      1.1
-+++ lib/editor/tinymce/plugins/advimage/image.htm      11 Nov 2009 05:18:39 -0000
-@@ -26,14 +26,15 @@
-                                               <legend>{#advimage_dlg.general}</legend>
-                                               <table class="properties">
-+                            <tr>
-+                                                              <td class="column1">&nbsp;</td>
-+                                <td align="left" id="srcbrowsercontainer">&nbsp;</td>
-+                            </tr>
-                                                       <tr>
-                                                               <td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>
--                                                              <td colspan="2"><table border="0" cellspacing="0" cellpadding="0">
--                                                                      <tr> 
--                                                                        <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> 
--                                                                        <td id="srcbrowsercontainer">&nbsp;</td>
--                                                                      </tr>
--                                                                </table></td>
-+                                                              <td>
-+                                <input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /> 
-+                                                              </td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td><label for="src_list">{#advimage_dlg.image_list}</label></td>
-@@ -41,12 +42,8 @@
-                                                       </tr>
-                                                       <tr> 
-                                                               <td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td> 
--                                                              <td colspan="2"><input id="alt" name="alt" type="text" value="" /></td> 
-+                                                              <td><input id="alt" name="alt" type="text" value="" /></td> 
-                                                       </tr> 
--                                                      <tr> 
--                                                              <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> 
--                                                              <td colspan="2"><input id="title" name="title" type="text" value="" /></td> 
--                                                      </tr>
-                                               </table>
-                               </fieldset>
-@@ -180,10 +177,13 @@
-                                       <table border="0" cellpadding="4" cellspacing="0">
-                                               <tr>
-+                                                      <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> 
-+                                                      <td><input id="title" name="title" type="text" value="" /></td> 
-+                                              </tr>
-+                                              <tr>
-                                                       <td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> 
-                                                       <td><input id="id" name="id" type="text" value="" /></td> 
-                                               </tr>
--
-                                               <tr>
-                                                       <td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td> 
-                                                       <td>
-Index: lib/editor/tinymce/plugins/advimage/css/advimage.css
-===================================================================
-RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/plugins/advimage/css/advimage.css,v
+RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/tiny_mce/3.3.8/plugins/advimage/css/advimage.css,v
 retrieving revision 1.1
 diff -u -r1.1 advimage.css
---- lib/editor/tinymce/plugins/advimage/css/advimage.css       16 May 2009 20:54:52 -0000      1.1
-+++ lib/editor/tinymce/plugins/advimage/css/advimage.css       11 Nov 2009 05:18:39 -0000
+--- css/advimage.css    4 Jul 2010 19:22:23 -0000   1.1
++++ css/advimage.css    4 Jul 2010 20:09:24 -0000
 @@ -1,13 +1,15 @@
  #src_list, #over_list, #out_list {width:280px;}
  .mceActionPanel {margin-top:7px;}
@@ -81,3 +23,61 @@ diff -u -r1.1 advimage.css
  #constrain, #onmousemovecheck {width:auto;}
 -#id, #dir, #lang, #usemap, #longdesc {width:200px;}
 +#id, #title, #dir, #lang, #usemap, #longdesc {width:200px;}
+Index: image.htm
+===================================================================
+RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/tiny_mce/3.3.8/plugins/advimage/image.htm,v
+retrieving revision 1.1
+diff -u -r1.1 image.htm
+--- image.htm   4 Jul 2010 19:21:49 -0000   1.1
++++ image.htm   4 Jul 2010 20:09:24 -0000
+@@ -26,14 +26,15 @@
+                        <legend>{#advimage_dlg.general}</legend>
+                        <table class="properties">
++                            <tr>
++                               <td class="column1">&nbsp;</td>
++                                <td align="left" id="srcbrowsercontainer">&nbsp;</td>
++                            </tr>
+                            <tr>
+                                <td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>
+-                               <td colspan="2"><table border="0" cellspacing="0" cellpadding="0">
+-                                   <tr> 
+-                                     <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> 
+-                                     <td id="srcbrowsercontainer">&nbsp;</td>
+-                                   </tr>
+-                                 </table></td>
++                               <td>
++                                <input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /> 
++                               </td>
+                            </tr>
+                            <tr>
+                                <td><label for="src_list">{#advimage_dlg.image_list}</label></td>
+@@ -41,12 +42,8 @@
+                            </tr>
+                            <tr> 
+                                <td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td> 
+-                               <td colspan="2"><input id="alt" name="alt" type="text" value="" /></td> 
++                               <td><input id="alt" name="alt" type="text" value="" /></td> 
+                            </tr> 
+-                           <tr> 
+-                               <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> 
+-                               <td colspan="2"><input id="title" name="title" type="text" value="" /></td> 
+-                           </tr>
+                        </table>
+                </fieldset>
+@@ -180,10 +177,13 @@
+                    <table border="0" cellpadding="4" cellspacing="0">
+                        <tr>
++                           <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> 
++                           <td><input id="title" name="title" type="text" value="" /></td> 
++                       </tr>
++                       <tr>
+                            <td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> 
+                            <td><input id="id" name="id" type="text" value="" /></td> 
+                        </tr>
+-
+                        <tr>
+                            <td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td> 
+                            <td>
index 1341e48..7182a28 100644 (file)
@@ -1,51 +1,41 @@
-Index: lib/editor/tinymce/Popup.js
+Index: tiny_mce_src.js
 ===================================================================
-RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/Popup.js,v
-retrieving revision 1.1
-diff -u -r1.1 Popup.js
---- lib/editor/tinymce/Popup.js 17 May 2009 07:37:42 -0000  1.1
-+++ lib/editor/tinymce/Popup.js 17 May 2009 08:05:08 -0000
-@@ -167,6 +167,7 @@
-     * when you open the window it will load the <plugin url>/langs/<code>_dlg.js lang pack file.
-     */
-    requireLangPack : function() {
-+       return; // not needed in Moodle - we load all lang packs in one request
-        var t = this, u = t.getWindowArg('plugin_url') || t.getWindowArg('theme_url');
-        if (u && t.editor.settings.language && t.features.translate_i18n !== false) {
-Index: lib/editor/tinymce/tiny_mce_src.js
-===================================================================
-RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/tiny_mce_src.js,v
+RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/tiny_mce/3.3.8/tiny_mce_src.js,v
 retrieving revision 1.1
 diff -u -r1.1 tiny_mce_src.js
---- lib/editor/tinymce/tiny_mce_src.js  16 May 2009 20:54:06 -0000  1.1
-+++ lib/editor/tinymce/tiny_mce_src.js  17 May 2009 08:05:14 -0000
-@@ -8057,6 +8057,7 @@
+--- tiny_mce_src.js 4 Jul 2010 19:21:59 -0000   1.1
++++ tiny_mce_src.js 4 Jul 2010 20:11:25 -0000
+@@ -8744,6 +8744,7 @@
         },
  
         requireLangPack : function(n) {
 +           return; // not needed in Moodle - we load all lang packs in one request
-            var u, s = tinymce.EditorManager.settings;
+            var s = tinymce.settings;
  
-            if (s && s.language) {
-@@ -8159,9 +8160,10 @@
-            // If page not loaded and strict mode isn't enabled then load them
-            if (!Event.domLoaded && !s.strict_loading_mode) {
-                // Load language
-+               /* not needed in Moodle - we load one lang file only
-                if (s.language)
-                    sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
--
-+               */
-                // Load theme
-                if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
-                    ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
-@@ -8677,7 +8679,7 @@
+            if (s && s.language)
+@@ -9334,7 +9335,8 @@
             // Load scripts
             function loadScripts() {
                 if (s.language)
 -                   sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
-+                   sl.add(tinymce.baseURL + '/extra/strings.php?elanguage=' + s.language + '&etheme=' + s.theme); // Moodle modification - load one huge strings file
++                   sl.add(tinymce.baseURL + '/../../extra/strings.php?elanguage=' + s.language + '&etheme=' + s.theme); // Moodle modification - load one huge strings file
++                   //sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
  
                 if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
                     ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
+Index: Popup.js
+===================================================================
+RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/tiny_mce/3.3.8/Popup.js,v
+retrieving revision 1.1
+diff -u -r1.1 Popup.js
+--- Popup.js    4 Jul 2010 19:21:59 -0000   1.1
++++ Popup.js    4 Jul 2010 20:11:19 -0000
+@@ -187,6 +187,8 @@
+     * @method requireLangPack
+     */
+    requireLangPack : function() {
++       return; // not needed in Moodle - we load all lang packs in one request
++
+        var t = this, u = t.getWindowArg('plugin_url') || t.getWindowArg('theme_url');
+        if (u && t.editor.settings.language && t.features.translate_i18n !== false) {
index 852d2ec..6a39832 100644 (file)
@@ -18,8 +18,7 @@
 /**
  * On-the-fly conversion of Moodle lang strings to TinyMCE expected JS format.
  *
- * @package    moodlecore
- * @subpackage editor
+ * @package    editor_tinymce
  * @copyright  2009 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -38,7 +37,7 @@ if (!get_string_manager()->translation_exists($lang, false)) {
 
 $string = get_string_manager()->load_component_strings('editor_tinymce', $lang);
 
-//process the $strings to match expected tinymce lang array stucture
+//process the $strings to match expected tinymce lang array structure
 $result = array();
 
 foreach ($string as $key=>$value) {
@@ -47,7 +46,6 @@ foreach ($string as $key=>$value) {
         // incorrect string - ignore
         continue;
     }
-    $value = str_replace("%%","%",$value);              // Unescape % characters
 
     $result[$parts[0]][$parts[1]] = $value;
 }
diff --git a/lib/editor/tinymce/extra/tools/compress.cmd b/lib/editor/tinymce/extra/tools/compress.cmd
deleted file mode 100644 (file)
index 0b107d2..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-java -jar yuicompressor.jar --line-break 1000 ..\..\tiny_mce_src.js -o ..\..\tiny_mce.js
-java -jar yuicompressor.jar --line-break 1000 ..\..\Popup.js -o ..\..\tiny_mce_popup.js
\ No newline at end of file
index dbdbfea..f173ebc 100644 (file)
@@ -1,3 +1,3 @@
 #!/bin/bash
-java -jar yuicompressor.jar --line-break 1000 ../../tiny_mce_src.js -o ../../tiny_mce.js
-java -jar yuicompressor.jar --line-break 1000 ../../Popup.js -o ../../tiny_mce_popup.js
\ No newline at end of file
+java -jar yuicompressor.jar --line-break 1000 ../../tiny_mce/3.3.8/tiny_mce_src.js -o ../../tiny_mce/3.3.8/tiny_mce.js
+java -jar yuicompressor.jar --line-break 1000 ../../tiny_mce/3.3.8/Popup.js -o ../../tiny_mce/3.3.8/tiny_mce_popup.js
\ No newline at end of file
index 359fcf9..7c185f4 100644 (file)
@@ -1,6 +1,8 @@
 #!/bin/bash
 mkdir temp
+mkdir temp/tinylangs
+mkdir temp/langs
 for lang in 'sq' 'ar' 'az' 'be' 'bn' 'nb' 'bs' 'br' 'bg' 'ca' 'ch' 'zh' 'hr' 'cs' 'da' 'dv' 'nl' 'en' 'et' 'fi' 'fr' 'gl' 'de' 'el' 'gu' 'he' 'hi' 'hu' 'is' 'id' 'ia' 'it' 'ja' 'ko' 'lv' 'lt' 'mk' 'ms' 'mn' 'se' 'no' 'nn' 'fa' 'pl' 'pt' 'ro' 'ru' 'sc' 'sr' 'ii' 'si' 'sk' 'sl' 'es' 'sv' 'ta' 'tt' 'te' 'th' 'tr' 'tw' 'uk' 'cy' 'vi'
 do
- wget "http://services.moxiecode.com/i18n/download.aspx?format=xml&code=$lang&product=tinymce" -O temp/$lang.xml
+ wget "http://services.moxiecode.com/i18n/download.aspx?format=xml&code=$lang&product=tinymce" -O temp/tinylangs/$lang.xml
 done
\ No newline at end of file
index 822e00e..538c4d8 100644 (file)
@@ -42,16 +42,16 @@ $langconversion = array(
     'zh_tw' => 'zh',
 );
 
-$targetlangdir = "$CFG->dirroot/../lang"; // change if needed
-$tempdir       = "$CFG->dirroot/lib/editor/tinymce/extra/tools/temp";
-$enfile        = "$CFG->dirroot/lang/en/editor_tinymce.php";
+$targetlangdir = "$CFG->dirroot/lib/editor/tinymce/extra/tools/temp/langs"; // change if needed
+$tempdir       = "$CFG->dirroot/lib/editor/tinymce/extra/tools/temp/tinylangs";
+$enfile        = "$CFG->dirroot/lib/editor/tinymce/lang/en/editor_tinymce.php";
 
 
 /// first update English lang pack
 if (!file_exists("$tempdir/en.xml")) {
-    die('Missing temp/en.xml! Did you download langs?');
+    die('Missing temp/tinylangs/en.xml! Did you download langs?');
 }
-$old_strings = editor_tinymce_get_all_strings($enfile);
+$old_strings = editor_tinymce_get_all_strings('en');
 ksort($old_strings);
 
 // our modifications and upstream changes in existing strings
@@ -75,7 +75,37 @@ if (!$handle = fopen($enfile, 'w')) {
      exit;
 }
 
-fwrite($handle, "<?php\n\n//== Custom Moodle strings that are not part of upstream TinyMCE ==\n");
+$header = <<<EOT
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Strings for component 'editor_tinymce', language 'en', branch 'MOODLE_20_STABLE'
+ *
+ * @package   editor_tinymce
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+EOT;
+
+fwrite($handle, $header);
+
+fwrite($handle, "\n\n//== Custom Moodle strings that are not part of upstream TinyMCE ==\n");
 foreach ($old_strings as $key=>$value) {
     fwrite($handle, editor_tinymce_encode_stringline($key, $value));
 }
@@ -94,9 +124,10 @@ if ($tweaked) {
 
 fclose($handle);
 
+die("No other lang strings for now\n"); //TODO: integrate with AMOS
 
 //now update all other langs
-$en_strings = editor_tinymce_get_all_strings($enfile);
+$en_strings = editor_tinymce_get_all_strings('en');
 if (!file_exists($targetlangdir)) {
     echo "Can not find target lang dir: $targetlangdir !!";
 }
@@ -131,7 +162,7 @@ foreach ($langs as $lang) {
     $langfile = "$targetlangdir/$lang/editor_tinymce.php";
 
     if (file_exists($langfile)) {
-        $old_strings = editor_tinymce_get_all_strings($langfile);
+        $old_strings = editor_tinymce_get_all_strings($lang);
         ksort($old_strings);
         foreach ($old_strings as $key=>$value) {
             if (!array_key_exists($key, $en_strings)) {
@@ -197,7 +228,6 @@ die("\nFinished!\n\n");
 /// ============ Utility functions ========================
 
 function editor_tinymce_encode_stringline($key, $value) {
-        $value = str_replace("%","%%",$value);              // Escape % characters
         return "\$string['$key'] = ".var_export($value, true).";\n";
 }
 
@@ -213,21 +243,17 @@ function editor_tinymce_parse_xml_lang($file) {
         foreach($items as $item) {
             $name  = $item->getAttribute('name');
             $value = $item->textContent;
+            //undo quoted stuff
+            $value = str_replace('\n', "\n", $value);
+            $value = str_replace('\'', "'", $value);
+            $value = str_replace('\\\\', '\\', $value);
             $result["$section:$name"] = $value;
         }
     }
     return $result;
 }
 
-function editor_tinymce_get_all_strings($file) {
-    global $CFG;
-
-    $string = array();
-    require($file);
-
-    foreach ($string as $key=>$value) {
-        $string[$key] = str_replace("%%","%",$value);              // Unescape % characters
-    }
-
-    return $string;
+function editor_tinymce_get_all_strings($lang) {
+    $sm = get_string_manager();
+    return $sm->load_component_strings('editor_tinymce', $lang);
 }
\ No newline at end of file
index 878962c..7066f6e 100644 (file)
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+
+//== Custom Moodle strings that are not part of upstream TinyMCE ==
+$string['common:browseimage'] = 'Find or upload an image...';
+$string['common:browsemedia'] = 'Find or upload a sound, video or applet...';
+$string['dragmath:dragmath_desc'] = 'Insert equation';
+$string['dragmath:dragmath_javaneeded'] = 'To use this page you need a Java-enabled browser. Download the latest Java plug-in from {$a}.';
+$string['dragmath:dragmath_title'] = 'DragMath Equation Editor';
+$string['media_dlg:filename'] = 'Filename';
+$string['pluginname'] = 'TinyMCE HTML editor';
+
+
+// == TinyMCE upstream lang strings from all plugins ==
 $string['advanced:address'] = 'Address';
 $string['advanced:anchor_delta_height'] = '';
 $string['advanced:anchor_delta_width'] = '';
@@ -33,6 +45,9 @@ $string['advanced:blockquote'] = 'Blockquote';
 $string['advanced:blockquote_desc'] = 'Blockquote';
 $string['advanced:bold_desc'] = 'Bold (Ctrl+B)';
 $string['advanced:bullist_desc'] = 'Unordered list';
+$string['advanced:charmap_delta_height'] = '';
+$string['advanced:charmap_delta_width'] = '';
+$string['advanced:charmap_desc'] = 'Insert custom character';
 $string['advanced:cleanup_desc'] = 'Cleanup messy code';
 $string['advanced:clipboard_msg'] = 'Copy/Cut/Paste is not available in Mozilla and Firefox.
 Do you want more information about this issue?';
@@ -45,6 +60,52 @@ $string['advanced:custom1_desc'] = 'Your custom description here';
 $string['advanced:cut_desc'] = 'Cut';
 $string['advanced:dd'] = 'Definition description';
 $string['advanced:div'] = 'Div';
+$string['advanced:dt'] = 'Definition term ';
+$string['advanced:font_size'] = 'Font size';
+$string['advanced:fontdefault'] = 'Font family';
+$string['advanced:forecolor_desc'] = 'Select text color';
+$string['advanced:h1'] = 'Heading 1';
+$string['advanced:h2'] = 'Heading 2';
+$string['advanced:h3'] = 'Heading 3';
+$string['advanced:h4'] = 'Heading 4';
+$string['advanced:h5'] = 'Heading 5';
+$string['advanced:h6'] = 'Heading 6';
+$string['advanced:help_desc'] = 'Help';
+$string['advanced:hr_desc'] = 'Insert horizontal ruler';
+$string['advanced:image_delta_height'] = '';
+$string['advanced:image_delta_width'] = '';
+$string['advanced:image_desc'] = 'Insert/edit image';
+$string['advanced:image_props_desc'] = 'Image properties';
+$string['advanced:indent_desc'] = 'Indent';
+$string['advanced:italic_desc'] = 'Italic (Ctrl+I)';
+$string['advanced:justifycenter_desc'] = 'Align center';
+$string['advanced:justifyfull_desc'] = 'Align full';
+$string['advanced:justifyleft_desc'] = 'Align left';
+$string['advanced:justifyright_desc'] = 'Align right';
+$string['advanced:link_delta_height'] = '';
+$string['advanced:link_delta_width'] = '';
+$string['advanced:link_desc'] = 'Insert/edit link';
+$string['advanced:more_colors'] = 'More colors';
+$string['advanced:newdocument'] = 'Are you sure you want clear all contents?';
+$string['advanced:newdocument_desc'] = 'New document';
+$string['advanced:numlist_desc'] = 'Ordered list';
+$string['advanced:outdent_desc'] = 'Outdent';
+$string['advanced:paragraph'] = 'Paragraph';
+$string['advanced:paste_desc'] = 'Paste';
+$string['advanced:path'] = 'Path';
+$string['advanced:pre'] = 'Preformatted';
+$string['advanced:redo_desc'] = 'Redo (Ctrl+Y)';
+$string['advanced:removeformat_desc'] = 'Remove formatting';
+$string['advanced:samp'] = 'Code sample';
+$string['advanced:striketrough_desc'] = 'Strikethrough';
+$string['advanced:style_select'] = 'Styles';
+$string['advanced:sub_desc'] = 'Subscript';
+$string['advanced:sup_desc'] = 'Superscript';
+$string['advanced:toolbar_focus'] = 'Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X';
+$string['advanced:underline_desc'] = 'Underline (Ctrl+U)';
+$string['advanced:undo_desc'] = 'Undo (Ctrl+Z)';
+$string['advanced:unlink_desc'] = 'Unlink';
+$string['advanced:visualaid_desc'] = 'Toggle guidelines/invisible elements';
 $string['advanced_dlg:about_author'] = 'Author';
 $string['advanced_dlg:about_general'] = 'About';
 $string['advanced_dlg:about_help'] = 'Help';
@@ -56,6 +117,7 @@ $string['advanced_dlg:about_title'] = 'About TinyMCE';
 $string['advanced_dlg:about_version'] = 'Version';
 $string['advanced_dlg:anchor_name'] = 'Anchor name';
 $string['advanced_dlg:anchor_title'] = 'Insert/edit anchor';
+$string['advanced_dlg:charmap_title'] = 'Select custom character';
 $string['advanced_dlg:code_title'] = 'HTML Source Editor';
 $string['advanced_dlg:code_wordwrap'] = 'Word wrap';
 $string['advanced_dlg:colorpicker_color'] = 'Color:';
@@ -67,7 +129,6 @@ $string['advanced_dlg:colorpicker_palette_title'] = 'Palette colors';
 $string['advanced_dlg:colorpicker_picker_tab'] = 'Picker';
 $string['advanced_dlg:colorpicker_picker_title'] = 'Color picker';
 $string['advanced_dlg:colorpicker_title'] = 'Select a color';
-$string['advanced_dlg:charmap_title'] = 'Select custom character';
 $string['advanced_dlg:image_align'] = 'Alignment';
 $string['advanced_dlg:image_align_baseline'] = 'Baseline';
 $string['advanced_dlg:image_align_bottom'] = 'Bottom';
@@ -94,55 +155,6 @@ $string['advanced_dlg:link_target_same'] = 'Open link in the same window';
 $string['advanced_dlg:link_title'] = 'Insert/edit link';
 $string['advanced_dlg:link_titlefield'] = 'Title';
 $string['advanced_dlg:link_url'] = 'Link URL';
-$string['advanced:dt'] = 'Definition term';
-$string['advanced:fontdefault'] = 'Font family';
-$string['advanced:font_size'] = 'Font size';
-$string['advanced:forecolor_desc'] = 'Select text color';
-$string['advanced:help_desc'] = 'Help';
-$string['advanced:hr_desc'] = 'Insert horizontal ruler';
-$string['advanced:h1'] = 'Heading 1';
-$string['advanced:h2'] = 'Heading 2';
-$string['advanced:h3'] = 'Heading 3';
-$string['advanced:h4'] = 'Heading 4';
-$string['advanced:h5'] = 'Heading 5';
-$string['advanced:h6'] = 'Heading 6';
-$string['advanced:charmap_delta_height'] = '';
-$string['advanced:charmap_delta_width'] = '';
-$string['advanced:charmap_desc'] = 'Insert custom character';
-$string['advanced:image_delta_height'] = '';
-$string['advanced:image_delta_width'] = '';
-$string['advanced:image_desc'] = 'Insert/edit image';
-$string['advanced:image_props_desc'] = 'Image properties';
-$string['advanced:indent_desc'] = 'Indent';
-$string['advanced:italic_desc'] = 'Italic (Ctrl+I)';
-$string['advanced:justifycenter_desc'] = 'Align center';
-$string['advanced:justifyfull_desc'] = 'Align full';
-$string['advanced:justifyleft_desc'] = 'Align left';
-$string['advanced:justifyright_desc'] = 'Align right';
-$string['advanced:link_delta_height'] = '';
-$string['advanced:link_delta_width'] = '';
-$string['advanced:link_desc'] = 'Insert/edit link';
-$string['advanced:more_colors'] = 'More colors';
-$string['advanced:newdocument'] = 'Are you sure you want clear all contents?';
-$string['advanced:newdocument_desc'] = 'New document';
-$string['advanced:numlist_desc'] = 'Ordered list';
-$string['advanced:outdent_desc'] = 'Outdent';
-$string['advanced:paragraph'] = 'Paragraph';
-$string['advanced:paste_desc'] = 'Paste';
-$string['advanced:path'] = 'Path';
-$string['advanced:pre'] = 'Preformatted';
-$string['advanced:redo_desc'] = 'Redo (Ctrl+Y)';
-$string['advanced:removeformat_desc'] = 'Remove formatting';
-$string['advanced:samp'] = 'Code sample';
-$string['advanced:striketrough_desc'] = 'Strikethrough';
-$string['advanced:style_select'] = 'Styles';
-$string['advanced:sub_desc'] = 'Subscript';
-$string['advanced:sup_desc'] = 'Superscript';
-$string['advanced:toolbar_focus'] = 'Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X';
-$string['advanced:underline_desc'] = 'Underline (Ctrl+U)';
-$string['advanced:undo_desc'] = 'Undo (Ctrl+Z)';
-$string['advanced:unlink_desc'] = 'Unlink';
-$string['advanced:visualaid_desc'] = 'Toggle guidelines/invisible elements';
 $string['advhr:advhr_desc'] = 'Horizontal rule';
 $string['advhr:delta_height'] = '';
 $string['advhr:delta_width'] = '';
@@ -151,6 +163,7 @@ $string['advhr_dlg:size'] = 'Height';
 $string['advhr_dlg:width'] = 'Width';
 $string['advimage:delta_height'] = '';
 $string['advimage:delta_width'] = '';
+$string['advimage:image_desc'] = 'Insert/edit image';
 $string['advimage_dlg:align'] = 'Alignment';
 $string['advimage_dlg:align_baseline'] = 'Baseline';
 $string['advimage_dlg:align_bottom'] = 'Bottom';
@@ -192,9 +205,9 @@ $string['advimage_dlg:tab_appearance'] = 'Appearance';
 $string['advimage_dlg:tab_general'] = 'General';
 $string['advimage_dlg:title'] = 'Title';
 $string['advimage_dlg:vspace'] = 'Vertical space';
-$string['advimage:image_desc'] = 'Insert/edit image';
 $string['advlink:delta_height'] = '';
 $string['advlink:delta_width'] = '';
+$string['advlink:link_desc'] = 'Insert/edit link';
 $string['advlink_dlg:accesskey'] = 'Accesskey';
 $string['advlink_dlg:advanced_props'] = 'Advanced properties';
 $string['advlink_dlg:advanced_tab'] = 'Advanced';
@@ -245,15 +258,27 @@ $string['advlink_dlg:target_top'] = 'Open in top frame (replaces all frames)';
 $string['advlink_dlg:title'] = 'Insert/edit link';
 $string['advlink_dlg:titlefield'] = 'Title';
 $string['advlink_dlg:url'] = 'Link URL';
-$string['advlink:link_desc'] = 'Insert/edit link';
+$string['advlist:circle'] = 'Circle';
+$string['advlist:def'] = 'Default';
+$string['advlist:disc'] = 'Disc';
+$string['advlist:lower_alpha'] = 'Lower alpha';
+$string['advlist:lower_greek'] = 'Lower greek';
+$string['advlist:lower_roman'] = 'Lower roman';
+$string['advlist:square'] = 'Square';
+$string['advlist:types'] = 'Types';
+$string['advlist:upper_alpha'] = 'Upper alpha';
+$string['advlist:upper_roman'] = 'Upper roman';
+$string['autosave:restore_content'] = 'Restore auto-saved content.';
 $string['autosave:unload_msg'] = 'The changes you made will be lost if you navigate away from this page.';
+$string['autosave:warning_message'] = 'If you restore the saved content, you will lose all the content that is currently in the editor.
+
+Are you sure you want to restore the saved content?.';
 $string['common:apply'] = 'Apply';
 $string['common:browse'] = 'Browse';
-$string['common:browseimage'] = 'Find or upload an image...';
-$string['common:browsemedia'] = 'Find or upload a sound, video or applet...';
 $string['common:cancel'] = 'Cancel';
 $string['common:class_name'] = 'Class';
-$string['common:clipboard_msg'] = 'Copy/Cut/Paste is not available in Mozilla and Firefox.nDo you want more information about this issue?';
+$string['common:clipboard_msg'] = 'Copy/Cut/Paste is not available in Mozilla and Firefox.
+Do you want more information about this issue?';
 $string['common:clipboard_no_support'] = 'Currently not supported by your browser, use keyboard shortcuts instead.';
 $string['common:close'] = 'Close';
 $string['common:edit_confirm'] = 'Do you want to use the WYSIWYG mode for this textarea?';
@@ -270,11 +295,9 @@ $string['contextmenu:left'] = 'Left';
 $string['contextmenu:right'] = 'Right';
 $string['directionality:ltr_desc'] = 'Direction left to right';
 $string['directionality:rtl_desc'] = 'Direction right to left';
-$string['dragmath:dragmath_desc'] = 'Inser equation';
-$string['dragmath:dragmath_javaneeded'] = 'To use this page you need a Java-enabled browser. Download the latest Java plug-in from {$a}.';
-$string['dragmath:dragmath_title'] = 'DragMath Equation Editor';
 $string['emotions:delta_height'] = '';
 $string['emotions:delta_width'] = '';
+$string['emotions:emotions_desc'] = 'Emotions';
 $string['emotions_dlg:cool'] = 'Cool';
 $string['emotions_dlg:cry'] = 'Cry';
 $string['emotions_dlg:desc'] = 'Emotions';
@@ -293,7 +316,6 @@ $string['emotions_dlg:tongue_out'] = 'Tongue out';
 $string['emotions_dlg:undecided'] = 'Undecided';
 $string['emotions_dlg:wink'] = 'Wink';
 $string['emotions_dlg:yell'] = 'Yell';
-$string['emotions:emotions_desc'] = 'Emotions';
 $string['fullpage:delta_height'] = '';
 $string['fullpage:delta_width'] = '';
 $string['fullpage:desc'] = 'Document properties';
@@ -319,22 +341,22 @@ $string['fullpage_dlg:base_element'] = 'Base element';
 $string['fullpage_dlg:bgcolor'] = 'Background color';
 $string['fullpage_dlg:bgimage'] = 'Background image';
 $string['fullpage_dlg:bottom_margin'] = 'Bottom margin';
+$string['fullpage_dlg:charset'] = 'Charset';
 $string['fullpage_dlg:comment_element'] = 'Comment';
 $string['fullpage_dlg:content'] = 'Content';
 $string['fullpage_dlg:copyright'] = 'Copyright';
 $string['fullpage_dlg:defer'] = 'Defer';
 $string['fullpage_dlg:doctypes'] = 'Doctype';
 $string['fullpage_dlg:encoding'] = 'Character encoding';
-$string['fullpage_dlg:fontface'] = 'Font family';
 $string['fullpage_dlg:font_face'] = 'Font face';
-$string['fullpage_dlg:fontsize'] = 'Font size';
 $string['fullpage_dlg:font_size'] = 'Font size';
+$string['fullpage_dlg:fontface'] = 'Font family';
+$string['fullpage_dlg:fontsize'] = 'Font size';
 $string['fullpage_dlg:general_props'] = 'General';
 $string['fullpage_dlg:head_elements'] = 'Head elements';
 $string['fullpage_dlg:hover_color'] = 'Hover color';
 $string['fullpage_dlg:href'] = 'Href';
 $string['fullpage_dlg:hreflang'] = 'Href lang';
-$string['fullpage_dlg:charset'] = 'Charset';
 $string['fullpage_dlg:info'] = 'Information';
 $string['fullpage_dlg:langcode'] = 'Language code';
 $string['fullpage_dlg:langdir'] = 'Language direction';
@@ -351,7 +373,7 @@ $string['fullpage_dlg:meta_index_follow'] = 'Index and follow the links';
 $string['fullpage_dlg:meta_index_nofollow'] = 'Index and don\'t follow the links';
 $string['fullpage_dlg:meta_keywords'] = 'Keywords';
 $string['fullpage_dlg:meta_noindex_follow'] = 'Do not index but follow the links';
-$string['fullpage_dlg:meta_noindex_nofollow'] = 'Do not index and don\'t follow the links';
+$string['fullpage_dlg:meta_noindex_nofollow'] = 'Do not index and don\\\'t follow the links';
 $string['fullpage_dlg:meta_props'] = 'Meta information';
 $string['fullpage_dlg:meta_robots'] = 'Robots';
 $string['fullpage_dlg:meta_tab'] = 'General';
@@ -371,8 +393,8 @@ $string['fullpage_dlg:style'] = 'Style';
 $string['fullpage_dlg:style_element'] = 'Style element';
 $string['fullpage_dlg:stylesheet'] = 'Stylesheet';
 $string['fullpage_dlg:target'] = 'Target';
-$string['fullpage_dlg:textcolor'] = 'Color';
 $string['fullpage_dlg:text_color'] = 'Text color';
+$string['fullpage_dlg:textcolor'] = 'Color';
 $string['fullpage_dlg:title'] = 'Document properties';
 $string['fullpage_dlg:title_element'] = 'Title element';
 $string['fullpage_dlg:top_margin'] = 'Top margin';
@@ -399,6 +421,7 @@ $string['layer:insertlayer_desc'] = 'Insert new layer';
 $string['media:delta_height'] = '';
 $string['media:delta_width'] = '';
 $string['media:desc'] = 'Insert / edit embedded media';
+$string['media:edit'] = 'Edit embedded media';
 $string['media_dlg:advanced'] = 'Advanced';
 $string['media_dlg:align'] = 'Align';
 $string['media_dlg:align_bottom'] = 'Bottom';
@@ -433,7 +456,6 @@ $string['media_dlg:enabled'] = 'Enabled';
 $string['media_dlg:enablejavascript'] = 'Enable JavaScript';
 $string['media_dlg:endtime'] = 'End time';
 $string['media_dlg:file'] = 'File/URL';
-$string['media_dlg:filename'] = 'Filename';
 $string['media_dlg:flash_options'] = 'Flash options';
 $string['media_dlg:flashvars'] = 'Flashvars';
 $string['media_dlg:flv_autostart'] = 'Auto start';
@@ -473,9 +495,10 @@ $string['media_dlg:prefetch'] = 'Prefetch';
 $string['media_dlg:preview'] = 'Preview';
 $string['media_dlg:progress'] = 'Progress';
 $string['media_dlg:qt_options'] = 'Quicktime options';
+$string['media_dlg:qt_stream_warn'] = 'Streamed rtsp resources should be added to the QT Src field under the advanced tab.
+You should also add a non streamed version to the Src field..';
 $string['media_dlg:qtsrc'] = 'QT Src';
 $string['media_dlg:qtsrcchokespeed'] = 'Choke speed';
-$string['media_dlg:qt_stream_warn'] = 'Streamed rtsp resources should be added to the QT Src field under the advanced tab.nYou should also add a non streamed version to the Src field..';
 $string['media_dlg:quality'] = 'Quality';
 $string['media_dlg:rate'] = 'Rate';
 $string['media_dlg:rmp_options'] = 'Real media player options';
@@ -501,22 +524,24 @@ $string['media_dlg:vspace'] = 'V-Space';
 $string['media_dlg:windowlessvideo'] = 'Windowless video';
 $string['media_dlg:wmode'] = 'WMode';
 $string['media_dlg:wmp_options'] = 'Windows media player options';
-$string['media:edit'] = 'Edit embedded media';
-$string['pluginname'] = 'TinyMCE HTML editor';
 $string['nonbreaking:nonbreaking_desc'] = 'Insert non-breaking space character';
 $string['pagebreak:desc'] = 'Insert page break.';
-$string['paste_dlg:text_linebreaks'] = 'Keep linebreaks';
-$string['paste_dlg:text_title'] = 'Use CTRL+V on your keyboard to paste the text into the window.';
-$string['paste_dlg:word_title'] = 'Use CTRL+V on your keyboard to paste the text into the window.';
 $string['paste:paste_text_desc'] = 'Paste as Plain Text';
 $string['paste:paste_word_desc'] = 'Paste from Word';
+$string['paste:plaintext_mode'] = 'Paste is now in plain text mode. Click again to toggle back to regular paste mode.';
+$string['paste:plaintext_mode_sticky'] = 'Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.';
 $string['paste:selectall_desc'] = 'Select All';
+$string['paste_dlg:text_linebreaks'] = 'Keep linebreaks';
+$string['paste_dlg:text_title'] = 'Use CTRL+V on your keyboard to paste the text into the window.';
+$string['paste_dlg:word_title'] = 'Use CTRL+V on your keyboard to paste the text into the window.';
 $string['preview:preview_desc'] = 'Preview';
 $string['print:print_desc'] = 'Print';
 $string['save:cancel_desc'] = 'Cancel all changes';
 $string['save:save_desc'] = 'Save';
 $string['searchreplace:delta_height'] = '';
 $string['searchreplace:delta_width'] = '';
+$string['searchreplace:replace_desc'] = 'Find/Replace';
+$string['searchreplace:search_desc'] = 'Find';
 $string['searchreplace_dlg:allreplaced'] = 'All occurrences of the search string were replaced.';
 $string['searchreplace_dlg:direction'] = 'Direction';
 $string['searchreplace_dlg:down'] = 'Down';
@@ -525,14 +550,12 @@ $string['searchreplace_dlg:findwhat'] = 'Find what';
 $string['searchreplace_dlg:mcase'] = 'Match case';
 $string['searchreplace_dlg:notfound'] = 'The search has been completed. The search string could not be found.';
 $string['searchreplace_dlg:replace'] = 'Replace';
-$string['searchreplace_dlg:replaceall'] = 'Replace all';
 $string['searchreplace_dlg:replace_title'] = 'Find/Replace';
+$string['searchreplace_dlg:replaceall'] = 'Replace all';
 $string['searchreplace_dlg:replacewith'] = 'Replace with';
-$string['searchreplace_dlg:searchnext_desc'] = 'Find again';
 $string['searchreplace_dlg:search_title'] = 'Find';
+$string['searchreplace_dlg:searchnext_desc'] = 'Find again';
 $string['searchreplace_dlg:up'] = 'Up';
-$string['searchreplace:replace_desc'] = 'Find/Replace';
-$string['searchreplace:search_desc'] = 'Find';
 $string['simple:bold_desc'] = 'Bold (Ctrl+B)';
 $string['simple:bullist_desc'] = 'Unordered list';
 $string['simple:cleanup_desc'] = 'Cleanup messy code';
@@ -628,6 +651,21 @@ $string['table:del'] = 'Delete table';
 $string['table:delete_col_desc'] = 'Remove column';
 $string['table:delete_row_desc'] = 'Delete row';
 $string['table:desc'] = 'Inserts a new table';
+$string['table:merge_cells_delta_height'] = '';
+$string['table:merge_cells_delta_width'] = '';
+$string['table:merge_cells_desc'] = 'Merge table cells';
+$string['table:paste_row_after_desc'] = 'Paste table row after';
+$string['table:paste_row_before_desc'] = 'Paste table row before';
+$string['table:props_desc'] = 'Table properties';
+$string['table:row'] = 'Row';
+$string['table:row_after_desc'] = 'Insert row after';
+$string['table:row_before_desc'] = 'Insert row before';
+$string['table:row_desc'] = 'Table row properties';
+$string['table:rowprops_delta_height'] = '';
+$string['table:rowprops_delta_width'] = '';
+$string['table:split_cells_desc'] = 'Split merged table cells';
+$string['table:table_delta_height'] = '';
+$string['table:table_delta_width'] = '';
 $string['table_dlg:advanced_props'] = 'Advanced properties';
 $string['table_dlg:advanced_tab'] = 'Advanced';
 $string['table_dlg:align'] = 'Alignment';
@@ -645,13 +683,13 @@ $string['table_dlg:caption'] = 'Table caption';
 $string['table_dlg:cell_all'] = 'Update all cells in table';
 $string['table_dlg:cell_cell'] = 'Update current cell';
 $string['table_dlg:cell_limit'] = 'You\'ve exceeded the maximum number of cells of {$cells}.';
-$string['table_dlg:cellpadding'] = 'Cellpadding';
 $string['table_dlg:cell_row'] = 'Update all cells in row';
-$string['table_dlg:cellspacing'] = 'Cellspacing';
 $string['table_dlg:cell_title'] = 'Table cell properties';
 $string['table_dlg:cell_type'] = 'Cell type';
-$string['table_dlg:colgroup'] = 'Col Group';
+$string['table_dlg:cellpadding'] = 'Cellpadding';
+$string['table_dlg:cellspacing'] = 'Cellspacing';
 $string['table_dlg:col_limit'] = 'You\'ve exceeded the maximum number of columns of {$cols}.';
+$string['table_dlg:colgroup'] = 'Col Group';
 $string['table_dlg:cols'] = 'Cols';
 $string['table_dlg:frame'] = 'Frame';
 $string['table_dlg:frame_all'] = 'all';
@@ -671,12 +709,12 @@ $string['table_dlg:mime'] = 'Target MIME type';
 $string['table_dlg:missing_scope'] = 'Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.';
 $string['table_dlg:row_all'] = 'Update all rows in table';
 $string['table_dlg:row_even'] = 'Update even rows in table';
-$string['table_dlg:rowgroup'] = 'Row Group';
 $string['table_dlg:row_limit'] = 'You\'ve exceeded the maximum number of rows of {$rows}.';
 $string['table_dlg:row_odd'] = 'Update odd rows in table';
 $string['table_dlg:row_row'] = 'Update current row';
-$string['table_dlg:rows'] = 'Rows';
 $string['table_dlg:row_title'] = 'Table row properties';
+$string['table_dlg:rowgroup'] = 'Row Group';
+$string['table_dlg:rows'] = 'Rows';
 $string['table_dlg:rowtype'] = 'Row in table part';
 $string['table_dlg:rtl'] = 'Right to left';
 $string['table_dlg:rules'] = 'Rules';
@@ -700,21 +738,6 @@ $string['table_dlg:thead'] = 'Table Head';
 $string['table_dlg:title'] = 'Insert/Modify table';
 $string['table_dlg:valign'] = 'Vertical alignment';
 $string['table_dlg:width'] = 'Width';
-$string['table:merge_cells_delta_height'] = '';
-$string['table:merge_cells_delta_width'] = '';
-$string['table:merge_cells_desc'] = 'Merge table cells';
-$string['table:paste_row_after_desc'] = 'Paste table row after';
-$string['table:paste_row_before_desc'] = 'Paste table row before';
-$string['table:props_desc'] = 'Table properties';
-$string['table:row'] = 'Row';
-$string['table:row_after_desc'] = 'Insert row after';
-$string['table:row_before_desc'] = 'Insert row before';
-$string['table:row_desc'] = 'Table row properties';
-$string['table:rowprops_delta_height'] = '';
-$string['table:rowprops_delta_width'] = '';
-$string['table:split_cells_desc'] = 'Split merged table cells';
-$string['table:table_delta_height'] = '';
-$string['table:table_delta_width'] = '';
 $string['template:desc'] = 'Insert predefined template content';
 $string['template_dlg:cdate_format'] = '%Y-%m-%d %H:%M:%S';
 $string['template_dlg:day_long'] = 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday';
@@ -745,8 +768,11 @@ $string['xhtmlxtras:cite_desc'] = 'Citation';
 $string['xhtmlxtras:del_delta_height'] = '';
 $string['xhtmlxtras:del_delta_width'] = '';
 $string['xhtmlxtras:del_desc'] = 'Deletion';
-$string['xhtmlxtras_dlg:attribs_title'] = 'Insert/Edit Attributes';
+$string['xhtmlxtras:ins_delta_height'] = '';
+$string['xhtmlxtras:ins_delta_width'] = '';
+$string['xhtmlxtras:ins_desc'] = 'Insertion';
 $string['xhtmlxtras_dlg:attrib_tab'] = 'Attributes';
+$string['xhtmlxtras_dlg:attribs_title'] = 'Insert/Edit Attributes';
 $string['xhtmlxtras_dlg:attribute_attrib_tab'] = 'Attributes';
 $string['xhtmlxtras_dlg:attribute_events_tab'] = 'Events';
 $string['xhtmlxtras_dlg:attribute_label_accesskey'] = 'AccessKey';
@@ -775,6 +801,4 @@ $string['xhtmlxtras_dlg:title_acronym_element'] = 'Acronym Element';
 $string['xhtmlxtras_dlg:title_cite_element'] = 'Citation Element';
 $string['xhtmlxtras_dlg:title_del_element'] = 'Deletion Element';
 $string['xhtmlxtras_dlg:title_ins_element'] = 'Insertion Element';
-$string['xhtmlxtras:ins_delta_height'] = '';
-$string['xhtmlxtras:ins_delta_width'] = '';
-$string['xhtmlxtras:ins_desc'] = 'Insertion';
+
diff --git a/lib/editor/tinymce/langs/en.js b/lib/editor/tinymce/langs/en.js
deleted file mode 100644 (file)
index ef3e18a..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-tinyMCE.addI18n({en:{
-common:{
-edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
-apply:"Apply",
-insert:"Insert",
-update:"Update",
-cancel:"Cancel",
-close:"Close",
-browse:"Browse",
-class_name:"Class",
-not_set:"-- Not set --",
-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
-clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
-popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
-invalid_data:"Error: Invalid values entered, these are marked in red.",
-more_colors:"More colors"
-},
-contextmenu:{
-align:"Alignment",
-left:"Left",
-center:"Center",
-right:"Right",
-full:"Full"
-},
-insertdatetime:{
-date_fmt:"%Y-%m-%d",
-time_fmt:"%H:%M:%S",
-insertdate_desc:"Insert date",
-inserttime_desc:"Insert time",
-months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
-months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
-day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",
-day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"
-},
-print:{
-print_desc:"Print"
-},
-preview:{
-preview_desc:"Preview"
-},
-directionality:{
-ltr_desc:"Direction left to right",
-rtl_desc:"Direction right to left"
-},
-layer:{
-insertlayer_desc:"Insert new layer",
-forward_desc:"Move forward",
-backward_desc:"Move backward",
-absolute_desc:"Toggle absolute positioning",
-content:"New layer..."
-},
-save:{
-save_desc:"Save",
-cancel_desc:"Cancel all changes"
-},
-nonbreaking:{
-nonbreaking_desc:"Insert non-breaking space character"
-},
-iespell:{
-iespell_desc:"Run spell checking",
-download:"ieSpell not detected. Do you want to install it now?"
-},
-advhr:{
-advhr_desc:"Horizontal rule"
-},
-emotions:{
-emotions_desc:"Emotions"
-},
-searchreplace:{
-search_desc:"Find",
-replace_desc:"Find/Replace"
-},
-advimage:{
-image_desc:"Insert/edit image"
-},
-advlink:{
-link_desc:"Insert/edit link"
-},
-xhtmlxtras:{
-cite_desc:"Citation",
-abbr_desc:"Abbreviation",
-acronym_desc:"Acronym",
-del_desc:"Deletion",
-ins_desc:"Insertion",
-attribs_desc:"Insert/Edit Attributes"
-},
-style:{
-desc:"Edit CSS Style"
-},
-paste:{
-paste_text_desc:"Paste as Plain Text",
-paste_word_desc:"Paste from Word",
-selectall_desc:"Select All"
-},
-paste_dlg:{
-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
-text_linebreaks:"Keep linebreaks",
-word_title:"Use CTRL+V on your keyboard to paste the text into the window."
-},
-table:{
-desc:"Inserts a new table",
-row_before_desc:"Insert row before",
-row_after_desc:"Insert row after",
-delete_row_desc:"Delete row",
-col_before_desc:"Insert column before",
-col_after_desc:"Insert column after",
-delete_col_desc:"Remove column",
-split_cells_desc:"Split merged table cells",
-merge_cells_desc:"Merge table cells",
-row_desc:"Table row properties",
-cell_desc:"Table cell properties",
-props_desc:"Table properties",
-paste_row_before_desc:"Paste table row before",
-paste_row_after_desc:"Paste table row after",
-cut_row_desc:"Cut table row",
-copy_row_desc:"Copy table row",
-del:"Delete table",
-row:"Row",
-col:"Column",
-cell:"Cell"
-},
-autosave:{
-unload_msg:"The changes you made will be lost if you navigate away from this page."
-},
-fullscreen:{
-desc:"Toggle fullscreen mode"
-},
-media:{
-desc:"Insert / edit embedded media",
-edit:"Edit embedded media"
-},
-fullpage:{
-desc:"Document properties"
-},
-template:{
-desc:"Insert predefined template content"
-},
-visualchars:{
-desc:"Visual control characters on/off."
-},
-spellchecker:{
-desc:"Toggle spellchecker",
-menu:"Spellchecker settings",
-ignore_word:"Ignore word",
-ignore_words:"Ignore all",
-langs:"Languages",
-wait:"Please wait...",
-sug:"Suggestions",
-no_sug:"No suggestions",
-no_mpell:"No misspellings found."
-},
-pagebreak:{
-desc:"Insert page break."
-}}});
\ No newline at end of file
index 293ddf6..e23088f 100644 (file)
 /**
  * TinyMCE text editor integration.
  *
- * @package    moodlecore
- * @subpackage editor
+ * @package    editor_tinymce
  * @copyright  2009 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 class tinymce_texteditor extends texteditor {
+    /** @var string active version - directory name */
+    public $version = '3.3.8';
+
     public function supported_by_browser() {
         if (check_browser_version('MSIE', 5.5)) {
             return true;
@@ -55,10 +57,10 @@ class tinymce_texteditor extends texteditor {
 
     public function head_setup() {
     }
-    
+
     public function use_editor($elementid, array $options=null, $fpoptions=null) {
         global $PAGE;
-        $PAGE->requires->js('/lib/editor/tinymce/tiny_mce_src.js');
+        $PAGE->requires->js('/lib/editor/tinymce/tiny_mce/'.$this->version.'/tiny_mce.js');
         $PAGE->requires->js_init_call('M.editor_tinymce.init_editor', array($elementid, $this->get_init_params($elementid, $options)), true);
         if ($fpoptions) {
             $PAGE->requires->js_init_call('M.editor_tinymce.init_filepicker', array($elementid, $fpoptions), true);
@@ -68,7 +70,7 @@ class tinymce_texteditor extends texteditor {
     protected function get_init_params($elementid, array $options=null) {
         global $CFG, $PAGE;
 
-        //TODO: we need to implement user preferences that affec tthe editor setup too
+        //TODO: we need to implement user preferences that affecthe editor setup too
 
         //TODO: reimplement rulesets, maybe it would be better to implement it some other way
         //$xmlruleset     = file_get_contents('extra/xhtml_ruleset.txt');
@@ -79,13 +81,12 @@ class tinymce_texteditor extends texteditor {
         $lang           = current_language();
         $contentcss     = $PAGE->theme->editor_css_url()->out(false);
 
+        $xmedia = '';
         $context = empty($options['context']) ? get_context_instance(CONTEXT_SYSTEM) : $options['context'];
         if (!empty($options['legacy'])) {
             $xmedia = 'moodlemedia,';
         } else {
             if (!empty($options['noclean']) or !empty($options['trusted'])) {
-            } else {
-                $xmedia = '';
             }
         }
 
@@ -129,7 +130,7 @@ class tinymce_texteditor extends texteditor {
                     'theme_advanced_resizing' => true,
                     'theme_advanced_toolbar_location' => "top",
                     'theme_advanced_statusbar_location' => "bottom",
-                    'spellchecker_rpc_url' => $CFG->wwwroot."/lib/editor/tinymce/plugins/spellchecker/rpc.php"
+                    'spellchecker_rpc_url' => $CFG->wwwroot."/lib/editor/tinymce/tiny_mce/'.$this->version.'/plugins/spellchecker/rpc.php"
                   );
 
         if (empty($options['legacy'])) {
diff --git a/lib/editor/tinymce/license.txt b/lib/editor/tinymce/license.txt
deleted file mode 100644 (file)
index 1837b0a..0000000
+++ /dev/null
@@ -1,504 +0,0 @@
-                 GNU LESSER GENERAL PUBLIC LICENSE
-                      Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                           Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                 GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                           NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                    END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
index e9b96d8..c76c1b7 100644 (file)
@@ -16,8 +16,7 @@
 /**
  * TinyMCE helper javascript functions
  *
- * @package    moodlecore
- * @subpackage editor
+ * @package    editor_tinymce
  * @copyright  2010 Petr Skoda (skodak) info@skoda.org
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/lib/editor/tinymce/plugins/advhr/css/advhr.css b/lib/editor/tinymce/plugins/advhr/css/advhr.css
deleted file mode 100644 (file)
index 3fe369c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-input.radio {border:1px none #000; background:transparent; vertical-align:middle;}
-.panel_wrapper div.current {height:80px;}
-#width {width:50px; vertical-align:middle;}
-#width2 {width:50px; vertical-align:middle;}
-#size {width:100px;}
diff --git a/lib/editor/tinymce/plugins/advhr/editor_plugin.js b/lib/editor/tinymce/plugins/advhr/editor_plugin.js
deleted file mode 100644 (file)
index 4d3b062..0000000
+++ /dev/null
@@ -1 +0,0 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advhr/editor_plugin_src.js b/lib/editor/tinymce/plugins/advhr/editor_plugin_src.js
deleted file mode 100644 (file)
index 2324835..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * $Id$
- *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-       tinymce.create('tinymce.plugins.AdvancedHRPlugin', {
-               init : function(ed, url) {
-                       // Register commands
-                       ed.addCommand('mceAdvancedHr', function() {
-                               ed.windowManager.open({
-                                       file : url + '/rule.htm',
-                                       width : 250 + parseInt(ed.getLang('advhr.delta_width', 0)),
-                                       height : 160 + parseInt(ed.getLang('advhr.delta_height', 0)),
-                                       inline : 1
-                               }, {
-                                       plugin_url : url
-                               });
-                       });
-
-                       // Register buttons
-                       ed.addButton('advhr', {
-                               title : 'advhr.advhr_desc',
-                               cmd : 'mceAdvancedHr'
-                       });
-
-                       ed.onNodeChange.add(function(ed, cm, n) {
-                               cm.setActive('advhr', n.nodeName == 'HR');
-                       });
-
-                       ed.onClick.add(function(ed, e) {
-                               e = e.target;
-
-                               if (e.nodeName === 'HR')
-                                       ed.selection.select(e);
-                       });
-               },
-
-               getInfo : function() {
-                       return {
-                               longname : 'Advanced HR',
-                               author : 'Moxiecode Systems AB',
-                               authorurl : 'http://tinymce.moxiecode.com',
-                               infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
-                               version : tinymce.majorVersion + "." + tinymce.minorVersion
-                       };
-               }
-       });
-
-       // Register plugin
-       tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);
-})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advhr/js/rule.js b/lib/editor/tinymce/plugins/advhr/js/rule.js
deleted file mode 100644 (file)
index a60c35f..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-var AdvHRDialog = {
-       init : function(ed) {
-               var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w;
-
-               w = dom.getAttrib(n, 'width');
-               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], st = '';
-
-               h = '<hr';
-
-               if (f.size.value) {
-                       h += ' size="' + f.size.value + '"';
-                       st += ' height:' + f.size.value + 'px;';
-               }
-
-               if (f.width.value) {
-                       h += ' width="' + f.width.value + (f.width2.value == '%' ? '%' : '') + '"';
-                       st += ' width:' + f.width.value + (f.width2.value == '%' ? '%' : 'px') + ';';
-               }
-
-               if (f.noshade.checked) {
-                       h += ' noshade="noshade"';
-                       st += ' border-width: 1px; border-style: solid; border-color: #CCCCCC; color: #ffffff;';
-               }
-
-               if (ed.settings.inline_styles)
-                       h += ' style="' + tinymce.trim(st) + '"';
-
-               h += ' />';
-
-               ed.execCommand("mceInsertContent", false, h);
-               tinyMCEPopup.close();
-       }
-};
-
-tinyMCEPopup.requireLangPack();
-tinyMCEPopup.onInit.add(AdvHRDialog.init, AdvHRDialog);
diff --git a/lib/editor/tinymce/plugins/advhr/langs/en_dlg.js b/lib/editor/tinymce/plugins/advhr/langs/en_dlg.js
deleted file mode 100644 (file)
index eec74db..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-tinyMCE.addI18n('en.advhr_dlg',{
-width:"Width",
-size:"Height",
-noshade:"No shadow"
-});
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advhr/rule.htm b/lib/editor/tinymce/plugins/advhr/rule.htm
deleted file mode 100644 (file)
index 8e54361..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-       <title>{#advhr.advhr_desc}</title>
-       <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-       <script type="text/javascript" src="js/rule.js"></script>
-       <script type="text/javascript" src="../../utils/mctabs.js"></script>
-       <script type="text/javascript" src="../../utils/form_utils.js"></script>
-       <link href="css/advhr.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-<form onsubmit="AdvHRDialog.update();return false;" action="#">
-       <div class="tabs">
-               <ul>
-                       <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
-               </ul>
-       </div>
-
-       <div class="panel_wrapper">
-               <div id="general_panel" class="panel current">
-                       <table border="0" cellpadding="4" cellspacing="0">
-                    <tr>
-                        <td><label for="width">{#advhr_dlg.width}</label></td>
-                        <td class="nowrap">
-                            <input id="width" name="width" type="text" value="" class="mceFocus" />
-                            <select name="width2" id="width2">
-                                <option value="">px</option>
-                                <option value="%">%</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><label for="size">{#advhr_dlg.size}</label></td>
-                        <td><select id="size" name="size">
-                            <option value="">Normal</option>
-                            <option value="1">1</option>
-                            <option value="2">2</option>
-                            <option value="3">3</option>
-                            <option value="4">4</option>
-                            <option value="5">5</option>
-                        </select></td>
-                    </tr>
-                    <tr>
-                        <td><label for="noshade">{#advhr_dlg.noshade}</label></td>
-                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
-                    </tr>
-            </table>
-               </div>
-       </div>
-
-       <div class="mceActionPanel">
-               <div style="float: left">
-                       <input type="submit" id="insert" name="insert" value="{#insert}" />
-               </div>
-
-               <div style="float: right">
-                       <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-               </div>
-       </div>
-</form>
-</body>
-</html>
diff --git a/lib/editor/tinymce/plugins/advimage/css/advimage.css b/lib/editor/tinymce/plugins/advimage/css/advimage.css
deleted file mode 100644 (file)
index 2bd1623..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#src_list, #over_list, #out_list {width:280px;}
-.mceActionPanel {margin-top:7px;}
-.alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;}
-.moodlebutton {
-    background: url(../../../../../../pix/a/search.png) .2em .2em no-repeat;
-    font-weight:bold;
-    font-size: 1.5em;
-    padding: .2em 1.5em;
-    border:1px solid #ccc;
-    text-decoration:none;
-}
-.checkbox {border:0;}
-.panel_wrapper div.current {height:305px;}
-#prev {margin:0; border:1px solid #000; width:428px; height:180px; 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;}
-#class_list {width:180px;}
-input {width: 280px;}
-#constrain, #onmousemovecheck {width:auto;}
-#id, #title, #dir, #lang, #usemap, #longdesc {width:200px;}
diff --git a/lib/editor/tinymce/plugins/advimage/editor_plugin.js b/lib/editor/tinymce/plugins/advimage/editor_plugin.js
deleted file mode 100644 (file)
index 4c7a9c3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advimage/editor_plugin_src.js b/lib/editor/tinymce/plugins/advimage/editor_plugin_src.js
deleted file mode 100644 (file)
index a5e4677..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * $Id$
- *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-       tinymce.create('tinymce.plugins.AdvancedImagePlugin', {
-               init : function(ed, url) {
-                       // Register commands
-                       ed.addCommand('mceAdvImage', function() {
-                               // Internal image object like a flash placeholder
-                               if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)
-                                       return;
-
-                               ed.windowManager.open({
-                                       file : url + '/image.htm',
-                                       width : 480 + parseInt(ed.getLang('advimage.delta_width', 0)),
-                                       height : 385 + parseInt(ed.getLang('advimage.delta_height', 0)),
-                                       inline : 1
-                               }, {
-                                       plugin_url : url
-                               });
-                       });
-
-                       // Register buttons
-                       ed.addButton('image', {
-                               title : 'advimage.image_desc',
-                               cmd : 'mceAdvImage'
-                       });
-               },
-
-               getInfo : function() {
-                       return {
-                               longname : 'Advanced image',
-                               author : 'Moxiecode Systems AB',
-                               authorurl : 'http://tinymce.moxiecode.com',
-                               infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
-                               version : tinymce.majorVersion + "." + tinymce.minorVersion
-                       };
-               }
-       });
-
-       // Register plugin
-       tinymce.PluginManager.add('advimage', tinymce.plugins.AdvancedImagePlugin);
-})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advimage/image.htm b/lib/editor/tinymce/plugins/advimage/image.htm
deleted file mode 100644 (file)
index 4ec22dd..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-       <title>{#advimage_dlg.dialog_title}</title>
-       <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-       <script type="text/javascript" src="../../utils/mctabs.js"></script>
-       <script type="text/javascript" src="../../utils/form_utils.js"></script>
-       <script type="text/javascript" src="../../utils/validate.js"></script>
-       <script type="text/javascript" src="../../utils/editable_selects.js"></script>
-       <script type="text/javascript" src="js/image.js"></script>
-       <link href="css/advimage.css" rel="stylesheet" type="text/css" />
-</head>
-<body id="advimage" style="display: none">
-    <form onsubmit="ImageDialog.insert();return false;" action="#"> 
-               <div class="tabs">
-                       <ul>
-                               <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>
-                               <li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>
-                               <li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>
-                       </ul>
-               </div>
-
-               <div class="panel_wrapper">
-                       <div id="general_panel" class="panel current">
-                               <fieldset>
-                                               <legend>{#advimage_dlg.general}</legend>
-
-                                               <table class="properties">
-                            <tr>
-                                                               <td class="column1">&nbsp;</td>
-                                <td align="left" id="srcbrowsercontainer">&nbsp;</td>
-                            </tr>
-                                                       <tr>
-                                                               <td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>
-                                                               <td>
-                                <input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /> 
-                                                               </td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td><label for="src_list">{#advimage_dlg.image_list}</label></td>
-                                                               <td><select id="src_list" name="src_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;document.getElementById('title').value=this.options[this.selectedIndex].text;ImageDialog.showPreviewImage(this.options[this.selectedIndex].value);"><option value=""></option></select></td>
-                                                       </tr>
-                                                       <tr> 
-                                                               <td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td> 
-                                                               <td><input id="alt" name="alt" type="text" value="" /></td> 
-                                                       </tr> 
-                                               </table>
-                               </fieldset>
-
-                               <fieldset>
-                                       <legend>{#advimage_dlg.preview}</legend>
-                                       <div id="prev"></div>
-                               </fieldset>
-                       </div>
-
-                       <div id="appearance_panel" class="panel">
-                               <fieldset>
-                                       <legend>{#advimage_dlg.tab_appearance}</legend>
-
-                                       <table border="0" cellpadding="4" cellspacing="0">
-                                               <tr> 
-                                                       <td class="column1"><label id="alignlabel" for="align">{#advimage_dlg.align}</label></td> 
-                                                       <td><select id="align" name="align" onchange="ImageDialog.updateStyle('align');ImageDialog.changeAppearance();"> 
-                                                                       <option value="">{#not_set}</option> 
-                                                                       <option value="baseline">{#advimage_dlg.align_baseline}</option>
-                                                                       <option value="top">{#advimage_dlg.align_top}</option>
-                                                                       <option value="middle">{#advimage_dlg.align_middle}</option>
-                                                                       <option value="bottom">{#advimage_dlg.align_bottom}</option>
-                                                                       <option value="text-top">{#advimage_dlg.align_texttop}</option>
-                                                                       <option value="text-bottom">{#advimage_dlg.align_textbottom}</option>
-                                                                       <option value="left">{#advimage_dlg.align_left}</option>
-                                                                       <option value="right">{#advimage_dlg.align_right}</option>
-                                                               </select> 
-                                                       </td>
-                                                       <td rowspan="6" valign="top">
-                                                               <div class="alignPreview">
-                                                                       <img id="alignSampleImg" src="img/sample.gif" alt="{#advimage_dlg.example_img}" />
-                                                                       Lorem ipsum, Dolor sit amet, consectetuer adipiscing loreum ipsum edipiscing elit, sed diam
-                                                                       nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.Loreum ipsum
-                                                                       edipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam
-                                                                       erat volutpat.
-                                                               </div>
-                                                       </td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="widthlabel" for="width">{#advimage_dlg.dimensions}</label></td>
-                                                       <td class="nowrap">
-                                                               <input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" /> x 
-                                                               <input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" /> px
-                                                       </td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td>&nbsp;</td>
-                                                       <td><table border="0" cellpadding="0" cellspacing="0">
-                                                                       <tr>
-                                                                               <td><input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
-                                                                               <td><label id="constrainlabel" for="constrain">{#advimage_dlg.constrain_proportions}</label></td>
-                                                                       </tr>
-                                                               </table></td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="vspacelabel" for="vspace">{#advimage_dlg.vspace}</label></td> 
-                                                       <td><input name="vspace" type="text" id="vspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('vspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('vspace');ImageDialog.changeAppearance();" />
-                                                       </td>
-                                               </tr>
-
-                                               <tr> 
-                                                       <td class="column1"><label id="hspacelabel" for="hspace">{#advimage_dlg.hspace}</label></td> 
-                                                       <td><input name="hspace" type="text" id="hspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" /></td> 
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="borderlabel" for="border">{#advimage_dlg.border}</label></td> 
-                                                       <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" /></td> 
-                                               </tr>
-
-                                               <tr>
-                                                       <td><label for="class_list">{#class_name}</label></td>
-                                                       <td colspan="2"><select id="class_list" name="class_list" class="mceEditableSelect"><option value=""></option></select></td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="stylelabel" for="style">{#advimage_dlg.style}</label></td> 
-                                                       <td colspan="2"><input id="style" name="style" type="text" value="" onchange="ImageDialog.changeAppearance();" /></td> 
-                                               </tr>
-
-                                               <!-- <tr>
-                                                       <td class="column1"><label id="classeslabel" for="classes">{#advimage_dlg.classes}</label></td> 
-                                                       <td colspan="2"><input id="classes" name="classes" type="text" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td> 
-                                               </tr> -->
-                                       </table>
-                               </fieldset>
-                       </div>
-
-                       <div id="advanced_panel" class="panel">
-                               <fieldset>
-                                       <legend>{#advimage_dlg.swap_image}</legend>
-
-                                       <input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" />
-                                       <label id="onmousemovechecklabel" for="onmousemovecheck">{#advimage_dlg.alt_image}</label>
-
-                                       <table border="0" cellpadding="4" cellspacing="0" width="100%">
-                                                       <tr>
-                                                               <td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td> 
-                                                               <td><table border="0" cellspacing="0" cellpadding="0"> 
-                                                                       <tr> 
-                                                                         <td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 
-                                                                         <td id="onmouseoversrccontainer">&nbsp;</td>
-                                                                       </tr>
-                                                                 </table></td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td><label for="over_list">{#advimage_dlg.image_list}</label></td>
-                                                               <td><select id="over_list" name="over_list" onchange="document.getElementById('onmouseoversrc').value=this.options[this.selectedIndex].value;"><option value=""></option></select></td>
-                                                       </tr>
-                                                       <tr> 
-                                                               <td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td> 
-                                                               <td class="column2"><table border="0" cellspacing="0" cellpadding="0"> 
-                                                                       <tr> 
-                                                                         <td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 
-                                                                         <td id="onmouseoutsrccontainer">&nbsp;</td>
-                                                                       </tr> 
-                                                                 </table></td> 
-                                                       </tr>
-                                                       <tr>
-                                                               <td><label for="out_list">{#advimage_dlg.image_list}</label></td>
-                                                               <td><select id="out_list" name="out_list" onchange="document.getElementById('onmouseoutsrc').value=this.options[this.selectedIndex].value;"><option value=""></option></select></td>
-                                                       </tr>
-                                       </table>
-                               </fieldset>
-
-                               <fieldset>
-                                       <legend>{#advimage_dlg.misc}</legend>
-
-                                       <table border="0" cellpadding="4" cellspacing="0">
-                                               <tr>
-                                                       <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> 
-                                                       <td><input id="title" name="title" type="text" value="" /></td> 
-                                               </tr>
-                                               <tr>
-                                                       <td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> 
-                                                       <td><input id="id" name="id" type="text" value="" /></td> 
-                                               </tr>
-                                               <tr>
-                                                       <td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td> 
-                                                       <td>
-                                                               <select id="dir" name="dir" onchange="ImageDialog.changeAppearance();"> 
-                                                                               <option value="">{#not_set}</option> 
-                                                                               <option value="ltr">{#advimage_dlg.ltr}</option> 
-                                                                               <option value="rtl">{#advimage_dlg.rtl}</option> 
-                                                               </select>
-                                                       </td> 
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="langlabel" for="lang">{#advimage_dlg.langcode}</label></td> 
-                                                       <td>
-                                                               <input id="lang" name="lang" type="text" value="" />
-                                                       </td> 
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="usemaplabel" for="usemap">{#advimage_dlg.map}</label></td> 
-                                                       <td>
-                                                               <input id="usemap" name="usemap" type="text" value="" />
-                                                       </td> 
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="longdesclabel" for="longdesc">{#advimage_dlg.long_desc}</label></td>
-                                                       <td><table border="0" cellspacing="0" cellpadding="0">
-                                                                       <tr>
-                                                                         <td><input id="longdesc" name="longdesc" type="text" value="" /></td>
-                                                                         <td id="longdesccontainer">&nbsp;</td>
-                                                                       </tr>
-                                                               </table></td> 
-                                               </tr>
-                                       </table>
-                               </fieldset>
-                       </div>
-               </div>
-
-               <div class="mceActionPanel">
-                       <div style="float: left">
-                               <input type="submit" id="insert" name="insert" value="{#insert}" />
-                       </div>
-
-                       <div style="float: right">
-                               <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-                       </div>
-               </div>
-    </form>
-</body> 
-</html> 
diff --git a/lib/editor/tinymce/plugins/advimage/img/sample.gif b/lib/editor/tinymce/plugins/advimage/img/sample.gif
deleted file mode 100644 (file)
index 53bf689..0000000
Binary files a/lib/editor/tinymce/plugins/advimage/img/sample.gif and /dev/null differ
diff --git a/lib/editor/tinymce/plugins/advimage/js/image.js b/lib/editor/tinymce/plugins/advimage/js/image.js
deleted file mode 100644 (file)
index 955e9cf..0000000
+++ /dev/null
@@ -1,443 +0,0 @@
-var ImageDialog = {
-       preInit : function() {
-               var url;
-
-               tinyMCEPopup.requireLangPack();
-
-               if (url = tinyMCEPopup.getParam("external_image_list_url"))
-                       document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
-       },
-
-       init : function(ed) {
-               var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();
-
-               tinyMCEPopup.resizeToInnerSize();
-               this.fillClassList('class_list');
-               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');
-                       nl.width.value = dom.getAttrib(n, 'width');
-                       nl.height.value = dom.getAttrib(n, 'height');
-                       nl.alt.value = dom.getAttrib(n, 'alt');
-                       nl.title.value = dom.getAttrib(n, 'title');
-                       nl.vspace.value = this.getAttrib(n, 'vspace');
-                       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'), true, true);
-                       nl.style.value = dom.getAttrib(n, 'style');
-                       nl.id.value = dom.getAttrib(n, 'id');
-                       nl.dir.value = dom.getAttrib(n, 'dir');
-                       nl.lang.value = dom.getAttrib(n, 'lang');
-                       nl.usemap.value = dom.getAttrib(n, 'usemap');
-                       nl.longdesc.value = dom.getAttrib(n, 'longdesc');
-                       nl.insert.value = ed.getLang('update');
-
-                       if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseover')))
-                               nl.onmouseoversrc.value = dom.getAttrib(n, 'onmouseover').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
-
-                       if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseout')))
-                               nl.onmouseoutsrc.value = dom.getAttrib(n, 'onmouseout').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
-
-                       if (ed.settings.inline_styles) {
-                               // Move attribs to styles
-                               if (dom.getAttrib(n, 'align'))
-                                       this.updateStyle('align');
-
-                               if (dom.getAttrib(n, 'hspace'))
-                                       this.updateStyle('hspace');
-
-                               if (dom.getAttrib(n, 'border'))
-                                       this.updateStyle('border');
-
-                               if (dom.getAttrib(n, 'vspace'))
-                                       this.updateStyle('vspace');
-                       }
-               }
-
-               // Setup browse button
-               document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
-               if (isVisible('srcbrowser'))
-                       document.getElementById('src').style.width = '260px';
-
-               // Setup browse button
-               document.getElementById('onmouseoversrccontainer').innerHTML = getBrowserHTML('overbrowser','onmouseoversrc','image','theme_advanced_image');
-               if (isVisible('overbrowser'))
-                       document.getElementById('onmouseoversrc').style.width = '260px';
-
-               // Setup browse button
-               document.getElementById('onmouseoutsrccontainer').innerHTML = getBrowserHTML('outbrowser','onmouseoutsrc','image','theme_advanced_image');
-               if (isVisible('outbrowser'))
-                       document.getElementById('onmouseoutsrc').style.width = '260px';
-
-               // If option enabled default contrain proportions to checked
-               if (ed.getParam("advimage_constrain_proportions", true))
-                       f.constrain.checked = true;
-
-               // Check swap image if valid data
-               if (nl.onmouseoversrc.value || nl.onmouseoutsrc.value)
-                       this.setSwapImage(true);
-               else
-                       this.setSwapImage(false);
-
-               this.changeAppearance();
-               this.showPreviewImage(nl.src.value, 1);
-       },
-
-       insert : function(file, title) {
-               var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];
-
-               if (f.src.value === '') {
-                       if (ed.selection.getNode().nodeName == 'IMG') {
-                               ed.dom.remove(ed.selection.getNode());
-                               ed.execCommand('mceRepaint');
-                       }
-
-                       tinyMCEPopup.close();
-                       return;
-               }
-
-               if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {
-                       if (!f.alt.value) {
-                               tinyMCEPopup.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {
-                                       if (s)
-                                               t.insertAndClose();
-                               });
-
-                               return;
-                       }
-               }
-
-               t.insertAndClose();
-       },
-
-       insertAndClose : function() {
-               var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el;
-
-               tinyMCEPopup.restoreSelection();
-
-               // Fixes crash in Safari
-               if (tinymce.isWebKit)
-                       ed.getWin().focus();
-
-               if (!ed.settings.inline_styles) {
-                       args = {
-                               vspace : nl.vspace.value,
-                               hspace : nl.hspace.value,
-                               border : nl.border.value,
-                               align : getSelectValue(f, 'align')
-                       };
-               } else {
-                       // Remove deprecated values
-                       args = {
-                               vspace : '',
-                               hspace : '',
-                               border : '',
-                               align : ''
-                       };
-               }
-
-               tinymce.extend(args, {
-                       src : nl.src.value,
-                       width : nl.width.value,
-                       height : nl.height.value,
-                       alt : nl.alt.value,
-                       title : nl.title.value,
-                       'class' : getSelectValue(f, 'class_list'),
-                       style : nl.style.value,
-                       id : nl.id.value,
-                       dir : nl.dir.value,
-                       lang : nl.lang.value,
-                       usemap : nl.usemap.value,
-                       longdesc : nl.longdesc.value
-               });
-
-               args.onmouseover = args.onmouseout = '';
-
-               if (f.onmousemovecheck.checked) {
-                       if (nl.onmouseoversrc.value)
-                               args.onmouseover = "this.src='" + nl.onmouseoversrc.value + "';";
-
-                       if (nl.onmouseoutsrc.value)
-                               args.onmouseout = "this.src='" + nl.onmouseoutsrc.value + "';";
-               }
-
-               el = ed.selection.getNode();
-
-               if (el && el.nodeName == 'IMG') {
-                       ed.dom.setAttribs(el, args);
-               } else {
-                       ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
-                       ed.dom.setAttribs('__mce_tmp', args);
-                       ed.dom.setAttrib('__mce_tmp', 'id', '');
-                       ed.undoManager.add();
-               }
-
-               tinyMCEPopup.close();
-       },
-
-       getAttrib : function(e, at) {
-               var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
-
-               if (ed.settings.inline_styles) {
-                       switch (at) {
-                               case 'align':
-                                       if (v = dom.getStyle(e, 'float'))
-                                               return v;
-
-                                       if (v = dom.getStyle(e, 'vertical-align'))
-                                               return v;
-
-                                       break;
-
-                               case 'hspace':
-                                       v = dom.getStyle(e, 'margin-left')
-                                       v2 = dom.getStyle(e, 'margin-right');
-
-                                       if (v && v == v2)
-                                               return parseInt(v.replace(/[^0-9]/g, ''));
-
-                                       break;
-
-                               case 'vspace':
-                                       v = dom.getStyle(e, 'margin-top')
-                                       v2 = dom.getStyle(e, 'margin-bottom');
-                                       if (v && v == v2)
-                                               return parseInt(v.replace(/[^0-9]/g, ''));
-
-                                       break;
-
-                               case 'border':
-                                       v = 0;
-
-                                       tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
-                                               sv = dom.getStyle(e, 'border-' + sv + '-width');
-
-                                               // False or not the same as prev
-                                               if (!sv || (sv != v && v !== 0)) {
-                                                       v = 0;
-                                                       return false;
-                                               }
-
-                                               if (sv)
-                                                       v = sv;
-                                       });
-
-                                       if (v)
-                                               return parseInt(v.replace(/[^0-9]/g, ''));
-
-                                       break;
-                       }
-               }
-
-               if (v = dom.getAttrib(e, at))
-                       return v;
-
-               return '';
-       },
-
-       setSwapImage : function(st) {
-               var f = document.forms[0];
-
-               f.onmousemovecheck.checked = st;
-               setBrowserDisabled('overbrowser', !st);
-               setBrowserDisabled('outbrowser', !st);
-
-               if (f.over_list)
-                       f.over_list.disabled = !st;
-
-               if (f.out_list)
-                       f.out_list.disabled = !st;
-
-               f.onmouseoversrc.disabled = !st;
-               f.onmouseoutsrc.disabled  = !st;
-       },
-
-       fillClassList : function(id) {
-               var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
-
-               if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
-                       cl = [];
-
-                       tinymce.each(v.split(';'), function(v) {
-                               var p = v.split('=');
-
-                               cl.push({'title' : p[0], 'class' : p[1]});
-                       });
-               } else
-                       cl = tinyMCEPopup.editor.dom.getClasses();
-
-               if (cl.length > 0) {
-                       lst.options.length = 0;
-                       lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
-
-                       tinymce.each(cl, function(o) {
-                               lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
-                       });
-               } else
-                       dom.remove(dom.getParent(id, 'tr'));
-       },
-
-       fillFileList : function(id, l) {
-               var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
-
-               l = window[l];
-               lst.options.length = 0;
-
-               if (l && l.length > 0) {
-                       lst.options[lst.options.length] = new Option('', '');
-
-                       tinymce.each(l, function(o) {
-                               lst.options[lst.options.length] = new Option(o[0], o[1]);
-                       });
-               } else
-                       dom.remove(dom.getParent(id, 'tr'));
-       },
-
-       resetImageData : function() {
-               var f = document.forms[0];
-
-               f.elements.width.value = f.elements.height.value = '';
-       },
-
-       updateImageData : function(img, st) {
-               var f = document.forms[0];
-
-               if (!st) {
-                       f.elements.width.value = img.width;
-                       f.elements.height.value = img.height;
-               }
-
-               this.preloadImg = img;
-       },
-
-       changeAppearance : function() {
-               var ed = tinyMCEPopup.editor, f = document.forms[0], img = document.getElementById('alignSampleImg');
-
-               if (img) {
-                       if (ed.getParam('inline_styles')) {
-                               ed.dom.setAttrib(img, 'style', f.style.value);
-                       } else {
-                               img.align = f.align.value;
-                               img.border = f.border.value;
-                               img.hspace = f.hspace.value;
-                               img.vspace = f.vspace.value;
-                       }
-               }
-       },
-
-       changeHeight : function() {
-               var f = document.forms[0], tp, t = this;
-
-               if (!f.constrain.checked || !t.preloadImg) {
-                       return;
-               }
-
-               if (f.width.value == "" || f.height.value == "")
-                       return;
-
-               tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height;
-               f.height.value = tp.toFixed(0);
-       },
-
-       changeWidth : function() {
-               var f = document.forms[0], tp, t = this;
-
-               if (!f.constrain.checked || !t.preloadImg) {
-                       return;
-               }
-
-               if (f.width.value == "" || f.height.value == "")
-                       return;
-
-               tp = (parseInt(f.height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width;
-               f.width.value = tp.toFixed(0);
-       },
-
-       updateStyle : function(ty) {
-               var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});
-
-               if (tinyMCEPopup.editor.settings.inline_styles) {
-                       // Handle align
-                       if (ty == 'align') {
-                               dom.setStyle(img, 'float', '');
-                               dom.setStyle(img, 'vertical-align', '');
-
-                               v = getSelectValue(f, 'align');
-                               if (v) {
-                                       if (v == 'left' || v == 'right')
-                                               dom.setStyle(img, 'float', v);
-                                       else
-                                               img.style.verticalAlign = v;
-                               }
-                       }
-
-                       // Handle border
-                       if (ty == 'border') {
-                               dom.setStyle(img, 'border', '');
-
-                               v = f.border.value;
-                               if (v || v == '0') {
-                                       if (v == '0')
-                                               img.style.border = '0';
-                                       else
-                                               img.style.border = v + 'px solid black';
-                               }
-                       }
-
-                       // Handle hspace
-                       if (ty == 'hspace') {
-                               dom.setStyle(img, 'marginLeft', '');
-                               dom.setStyle(img, 'marginRight', '');
-
-                               v = f.hspace.value;
-                               if (v) {
-                                       img.style.marginLeft = v + 'px';
-                                       img.style.marginRight = v + 'px';
-                               }
-                       }
-
-                       // Handle vspace
-                       if (ty == 'vspace') {
-                               dom.setStyle(img, 'marginTop', '');
-                               dom.setStyle(img, 'marginBottom', '');
-
-                               v = f.vspace.value;
-                               if (v) {
-                                       img.style.marginTop = v + 'px';
-                                       img.style.marginBottom = v + 'px';
-                               }
-                       }
-
-                       // Merge
-                       dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText));
-               }
-       },
-
-       changeMouseMove : function() {
-       },
-
-       showPreviewImage : function(u, st) {
-               if (!u) {
-                       tinyMCEPopup.dom.setHTML('prev', '');
-                       return;
-               }
-
-               if (!st && tinyMCEPopup.getParam("advimage_update_dimensions_onchange", true))
-                       this.resetImageData();
-
-               u = tinyMCEPopup.editor.documentBaseURI.toAbsolute(u);
-
-               if (!st)
-                       tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this);" onerror="ImageDialog.resetImageData();" />');
-               else
-                       tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this, 1);" />');
-       }
-};
-
-ImageDialog.preInit();
-tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
diff --git a/lib/editor/tinymce/plugins/advimage/langs/en_dlg.js b/lib/editor/tinymce/plugins/advimage/langs/en_dlg.js
deleted file mode 100644 (file)
index ef81f78..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-tinyMCE.addI18n('en.advimage_dlg',{
-tab_general:"General",
-tab_appearance:"Appearance",
-tab_advanced:"Advanced",
-general:"General",
-title:"Title",
-preview:"Preview",
-constrain_proportions:"Constrain proportions",
-langdir:"Language direction",
-langcode:"Language code",
-long_desc:"Long description link",
-style:"Style",
-classes:"Classes",
-ltr:"Left to right",
-rtl:"Right to left",
-id:"Id",
-map:"Image map",
-swap_image:"Swap image",
-alt_image:"Alternative image",
-mouseover:"for mouse over",
-mouseout:"for mouse out",
-misc:"Miscellaneous",
-example_img:"Appearance preview image",
-missing_alt:"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.",
-dialog_title:"Insert/edit image",
-src:"Image URL",
-alt:"Image description",
-list:"Image list",
-border:"Border",
-dimensions:"Dimensions",
-vspace:"Vertical space",
-hspace:"Horizontal space",
-align:"Alignment",
-align_baseline:"Baseline",
-align_top:"Top",
-align_middle:"Middle",
-align_bottom:"Bottom",
-align_texttop:"Text top",
-align_textbottom:"Text bottom",
-align_left:"Left",
-align_right:"Right",
-image_list:"Image list"
-});
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advlink/css/advlink.css b/lib/editor/tinymce/plugins/advlink/css/advlink.css
deleted file mode 100644 (file)
index 66c6549..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-.mceLinkList, .mceAnchorList, #targetlist {width:280px;}
-.mceActionPanel {margin-top:7px;}
-.panel_wrapper div.current {height:320px;}
-#classlist, #title, #href {width:280px;}
-#popupurl, #popupname {width:200px;}
-#popupwidth, #popupheight, #popupleft, #popuptop {width:30px;vertical-align:middle;text-align:center;}
-#id, #style, #classes, #target, #dir, #hreflang, #lang, #charset, #type, #rel, #rev, #tabindex, #accesskey {width:200px;}
-#events_panel input {width:200px;}
diff --git a/lib/editor/tinymce/plugins/advlink/editor_plugin.js b/lib/editor/tinymce/plugins/advlink/editor_plugin.js
deleted file mode 100644 (file)
index 983fe5a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedLinkPlugin",{init:function(a,b){this.editor=a;a.addCommand("mceAdvLink",function(){var c=a.selection;if(c.isCollapsed()&&!a.dom.getParent(c.getNode(),"A")){return}a.windowManager.open({file:b+"/link.htm",width:480+parseInt(a.getLang("advlink.delta_width",0)),height:400+parseInt(a.getLang("advlink.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("link",{title:"advlink.link_desc",cmd:"mceAdvLink"});a.addShortcut("ctrl+k","advlink.advlink_desc","mceAdvLink");a.onNodeChange.add(function(d,c,f,e){c.setDisabled("link",e&&f.nodeName!="A");c.setActive("link",f.nodeName=="A"&&!f.name)})},getInfo:function(){return{longname:"Advanced link",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlink",tinymce.plugins.AdvancedLinkPlugin)})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advlink/editor_plugin_src.js b/lib/editor/tinymce/plugins/advlink/editor_plugin_src.js
deleted file mode 100644 (file)
index 96b978b..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * $Id$
- *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-       tinymce.create('tinymce.plugins.AdvancedLinkPlugin', {
-               init : function(ed, url) {
-                       this.editor = ed;
-
-                       // Register commands
-                       ed.addCommand('mceAdvLink', function() {
-                               var se = ed.selection;
-
-                               // No selection and not in link
-                               if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A'))
-                                       return;
-
-                               ed.windowManager.open({
-                                       file : url + '/link.htm',
-                                       width : 480 + parseInt(ed.getLang('advlink.delta_width', 0)),
-                                       height : 400 + parseInt(ed.getLang('advlink.delta_height', 0)),
-                                       inline : 1
-                               }, {
-                                       plugin_url : url
-                               });
-                       });
-
-                       // Register buttons
-                       ed.addButton('link', {
-                               title : 'advlink.link_desc',
-                               cmd : 'mceAdvLink'
-                       });
-
-                       ed.addShortcut('ctrl+k', 'advlink.advlink_desc', 'mceAdvLink');
-
-                       ed.onNodeChange.add(function(ed, cm, n, co) {
-                               cm.setDisabled('link', co && n.nodeName != 'A');
-                               cm.setActive('link', n.nodeName == 'A' && !n.name);
-                       });
-               },
-
-               getInfo : function() {
-                       return {
-                               longname : 'Advanced link',
-                               author : 'Moxiecode Systems AB',
-                               authorurl : 'http://tinymce.moxiecode.com',
-                               infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',
-                               version : tinymce.majorVersion + "." + tinymce.minorVersion
-                       };
-               }
-       });
-
-       // Register plugin
-       tinymce.PluginManager.add('advlink', tinymce.plugins.AdvancedLinkPlugin);
-})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advlink/js/advlink.js b/lib/editor/tinymce/plugins/advlink/js/advlink.js
deleted file mode 100644 (file)
index 03fddc5..0000000
+++ /dev/null
@@ -1,528 +0,0 @@
-/* Functions for the advlink plugin popup */
-
-tinyMCEPopup.requireLangPack();
-
-var templates = {
-       "window.open" : "window.open('${url}','${target}','${options}')"
-};
-
-function preinit() {
-       var url;
-
-       if (url = tinyMCEPopup.getParam("external_link_list_url"))
-               document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
-}
-
-function changeClass() {
-       var f = document.forms[0];
-
-       f.classes.value = getSelectValue(f, 'classlist');
-}
-
-function init() {
-       tinyMCEPopup.resizeToInnerSize();
-
-       var formObj = document.forms[0];
-       var inst = tinyMCEPopup.editor;
-       var elm = inst.selection.getNode();
-       var action = "insert";
-       var html;
-
-       document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');
-       document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');
-       document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');
-       document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');
-       document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');
-
-       // Link list
-       html = getLinkListHTML('linklisthref','href');
-       if (html == "")
-               document.getElementById("linklisthrefrow").style.display = 'none';
-       else
-               document.getElementById("linklisthrefcontainer").innerHTML = html;
-
-       // Resize some elements
-       if (isVisible('hrefbrowser'))
-               document.getElementById('href').style.width = '260px';
-
-       if (isVisible('popupurlbrowser'))
-               document.getElementById('popupurl').style.width = '180px';
-
-       elm = inst.dom.getParent(elm, "A");
-       if (elm != null && elm.nodeName == "A")
-               action = "update";
-
-       formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true); 
-
-       setPopupControlsDisabled(true);
-
-       if (action == "update") {
-               var href = inst.dom.getAttrib(elm, 'href');
-               var onclick = inst.dom.getAttrib(elm, 'onclick');
-
-               // Setup form data
-               setFormValue('href', href);
-               setFormValue('title', inst.dom.getAttrib(elm, 'title'));
-               setFormValue('id', inst.dom.getAttrib(elm, 'id'));
-               setFormValue('style', inst.dom.getAttrib(elm, "style"));
-               setFormValue('rel', inst.dom.getAttrib(elm, 'rel'));
-               setFormValue('rev', inst.dom.getAttrib(elm, 'rev'));
-               setFormValue('charset', inst.dom.getAttrib(elm, 'charset'));
-               setFormValue('hreflang', inst.dom.getAttrib(elm, 'hreflang'));
-               setFormValue('dir', inst.dom.getAttrib(elm, 'dir'));
-               setFormValue('lang', inst.dom.getAttrib(elm, 'lang'));
-               setFormValue('tabindex', inst.dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
-               setFormValue('accesskey', inst.dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
-               setFormValue('type', inst.dom.getAttrib(elm, 'type'));
-               setFormValue('onfocus', inst.dom.getAttrib(elm, 'onfocus'));
-               setFormValue('onblur', inst.dom.getAttrib(elm, 'onblur'));
-               setFormValue('onclick', onclick);
-               setFormValue('ondblclick', inst.dom.getAttrib(elm, 'ondblclick'));
-               setFormValue('onmousedown', inst.dom.getAttrib(elm, 'onmousedown'));
-               setFormValue('onmouseup', inst.dom.getAttrib(elm, 'onmouseup'));
-               setFormValue('onmouseover', inst.dom.getAttrib(elm, 'onmouseover'));
-               setFormValue('onmousemove', inst.dom.getAttrib(elm, 'onmousemove'));
-               setFormValue('onmouseout', inst.dom.getAttrib(elm, 'onmouseout'));
-               setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress'));
-               setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown'));
-               setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup'));
-               setFormValue('target', inst.dom.getAttrib(elm, 'target'));
-               setFormValue('classes', inst.dom.getAttrib(elm, 'class'));
-
-               // Parse onclick data
-               if (onclick != null && onclick.indexOf('window.open') != -1)
-                       parseWindowOpen(onclick);
-               else
-                       parseFunction(onclick);
-
-               // Select by the values
-               selectByValue(formObj, 'dir', inst.dom.getAttrib(elm, 'dir'));
-               selectByValue(formObj, 'rel', inst.dom.getAttrib(elm, 'rel'));
-               selectByValue(formObj, 'rev', inst.dom.getAttrib(elm, 'rev'));
-               selectByValue(formObj, 'linklisthref', href);
-
-               if (href.charAt(0) == '#')
-                       selectByValue(formObj, 'anchorlist', href);
-
-               addClassesToList('classlist', 'advlink_styles');
-
-               selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true);
-               selectByValue(formObj, 'targetlist', inst.dom.getAttrib(elm, 'target'), true);
-       } else
-               addClassesToList('classlist', 'advlink_styles');
-}
-
-function checkPrefix(n) {
-       if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))
-               n.value = 'mailto:' + n.value;
-
-       if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))
-               n.value = 'http://' + n.value;
-}
-
-function setFormValue(name, value) {
-       document.forms[0].elements[name].value = value;
-}
-
-function parseWindowOpen(onclick) {
-       var formObj = document.forms[0];
-
-       // Preprocess center code
-       if (onclick.indexOf('return false;') != -1) {
-               formObj.popupreturn.checked = true;
-               onclick = onclick.replace('return false;', '');
-       } else
-               formObj.popupreturn.checked = false;
-
-       var onClickData = parseLink(onclick);
-
-       if (onClickData != null) {
-               formObj.ispopup.checked = true;
-               setPopupControlsDisabled(false);
-
-               var onClickWindowOptions = parseOptions(onClickData['options']);
-               var url = onClickData['url'];
-
-               formObj.popupname.value = onClickData['target'];
-               formObj.popupurl.value = url;
-               formObj.popupwidth.value = getOption(onClickWindowOptions, 'width');
-               formObj.popupheight.value = getOption(onClickWindowOptions, 'height');
-
-               formObj.popupleft.value = getOption(onClickWindowOptions, 'left');
-               formObj.popuptop.value = getOption(onClickWindowOptions, 'top');
-
-               if (formObj.popupleft.value.indexOf('screen') != -1)
-                       formObj.popupleft.value = "c";
-
-               if (formObj.popuptop.value.indexOf('screen') != -1)
-                       formObj.popuptop.value = "c";
-
-               formObj.popuplocation.checked = getOption(onClickWindowOptions, 'location') == "yes";
-               formObj.popupscrollbars.checked = getOption(onClickWindowOptions, 'scrollbars') == "yes";
-               formObj.popupmenubar.checked = getOption(onClickWindowOptions, 'menubar') == "yes";
-               formObj.popupresizable.checked = getOption(onClickWindowOptions, 'resizable') == "yes";
-               formObj.popuptoolbar.checked = getOption(onClickWindowOptions, 'toolbar') == "yes";
-               formObj.popupstatus.checked = getOption(onClickWindowOptions, 'status') == "yes";
-               formObj.popupdependent.checked = getOption(onClickWindowOptions, 'dependent') == "yes";
-
-               buildOnClick();
-       }
-}
-
-function parseFunction(onclick) {
-       var formObj = document.forms[0];
-       var onClickData = parseLink(onclick);
-
-       // TODO: Add stuff here
-}
-
-function getOption(opts, name) {
-       return typeof(opts[name]) == "undefined" ? "" : opts[name];
-}
-
-function setPopupControlsDisabled(state) {
-       var formObj = document.forms[0];
-
-       formObj.popupname.disabled = state;
-       formObj.popupurl.disabled = state;
-       formObj.popupwidth.disabled = state;
-       formObj.popupheight.disabled = state;
-       formObj.popupleft.disabled = state;
-       formObj.popuptop.disabled = state;
-       formObj.popuplocation.disabled = state;
-       formObj.popupscrollbars.disabled = state;
-       formObj.popupmenubar.disabled = state;
-       formObj.popupresizable.disabled = state;
-       formObj.popuptoolbar.disabled = state;
-       formObj.popupstatus.disabled = state;
-       formObj.popupreturn.disabled = state;
-       formObj.popupdependent.disabled = state;
-
-       setBrowserDisabled('popupurlbrowser', state);
-}
-
-function parseLink(link) {
-       link = link.replace(new RegExp('&#39;', 'g'), "'");
-
-       var fnName = link.replace(new RegExp("\\s*([A-Za-z0-9\.]*)\\s*\\(.*", "gi"), "$1");
-
-       // Is function name a template function
-       var template = templates[fnName];
-       if (template) {
-               // Build regexp
-               var variableNames = template.match(new RegExp("'?\\$\\{[A-Za-z0-9\.]*\\}'?", "gi"));
-               var regExp = "\\s*[A-Za-z0-9\.]*\\s*\\(";
-               var replaceStr = "";
-               for (var i=0; i<variableNames.length; i++) {
-                       // Is string value
-                       if (variableNames[i].indexOf("'${") != -1)
-                               regExp += "'(.*)'";
-                       else // Number value
-                               regExp += "([0-9]*)";
-
-                       replaceStr += "$" + (i+1);
-
-                       // Cleanup variable name
-                       variableNames[i] = variableNames[i].replace(new RegExp("[^A-Za-z0-9]", "gi"), "");
-
-                       if (i != variableNames.length-1) {
-                               regExp += "\\s*,\\s*";
-                               replaceStr += "<delim>";
-                       } else
-                               regExp += ".*";
-               }
-
-               regExp += "\\);?";
-
-               // Build variable array
-               var variables = [];
-               variables["_function"] = fnName;
-               var variableValues = link.replace(new RegExp(regExp, "gi"), replaceStr).split('<delim>');
-               for (var i=0; i<variableNames.length; i++)
-                       variables[variableNames[i]] = variableValues[i];
-
-               return variables;
-       }
-
-       return null;
-}
-
-function parseOptions(opts) {
-       if (opts == null || opts == "")
-               return [];
-
-       // Cleanup the options
-       opts = opts.toLowerCase();
-       opts = opts.replace(/;/g, ",");
-       opts = opts.replace(/[^0-9a-z=,]/g, "");
-
-       var optionChunks = opts.split(',');
-       var options = [];
-
-       for (var i=0; i<optionChunks.length; i++) {
-               var parts = optionChunks[i].split('=');
-
-               if (parts.length == 2)
-                       options[parts[0]] = parts[1];
-       }
-
-       return options;
-}
-
-function buildOnClick() {
-       var formObj = document.forms[0];
-
-       if (!formObj.ispopup.checked) {
-               formObj.onclick.value = "";
-               return;
-       }
-
-       var onclick = "window.open('";
-       var url = formObj.popupurl.value;
-
-       onclick += url + "','";
-       onclick += formObj.popupname.value + "','";
-
-       if (formObj.popuplocation.checked)
-               onclick += "location=yes,";
-
-       if (formObj.popupscrollbars.checked)
-               onclick += "scrollbars=yes,";
-
-       if (formObj.popupmenubar.checked)
-               onclick += "menubar=yes,";
-
-       if (formObj.popupresizable.checked)
-               onclick += "resizable=yes,";
-
-       if (formObj.popuptoolbar.checked)
-               onclick += "toolbar=yes,";
-
-       if (formObj.popupstatus.checked)
-               onclick += "status=yes,";
-
-       if (formObj.popupdependent.checked)
-               onclick += "dependent=yes,";
-
-       if (formObj.popupwidth.value != "")
-               onclick += "width=" + formObj.popupwidth.value + ",";
-
-       if (formObj.popupheight.value != "")
-               onclick += "height=" + formObj.popupheight.value + ",";
-
-       if (formObj.popupleft.value != "") {
-               if (formObj.popupleft.value != "c")
-                       onclick += "left=" + formObj.popupleft.value + ",";
-               else
-                       onclick += "left='+(screen.availWidth/2-" + (formObj.popupwidth.value/2) + ")+',";
-       }
-
-       if (formObj.popuptop.value != "") {
-               if (formObj.popuptop.value != "c")
-                       onclick += "top=" + formObj.popuptop.value + ",";
-               else
-                       onclick += "top='+(screen.availHeight/2-" + (formObj.popupheight.value/2) + ")+',";
-       }
-
-       if (onclick.charAt(onclick.length-1) == ',')
-               onclick = onclick.substring(0, onclick.length-1);
-
-       onclick += "');";
-
-       if (formObj.popupreturn.checked)
-               onclick += "return false;";
-
-       // tinyMCE.debug(onclick);
-
-       formObj.onclick.value = onclick;
-
-       if (formObj.href.value == "")
-               formObj.href.value = url;
-}
-
-function setAttrib(elm, attrib, value) {
-       var formObj = document.forms[0];
-       var valueElm = formObj.elements[attrib.toLowerCase()];
-       var dom = tinyMCEPopup.editor.dom;
-
-       if (typeof(value) == "undefined" || value == null) {
-               value = "";
-
-               if (valueElm)
-                       value = valueElm.value;
-       }
-
-       // Clean up the style
-       if (attrib == 'style')
-               value = dom.serializeStyle(dom.parseStyle(value));
-
-       dom.setAttrib(elm, attrib, value);
-}
-
-function getAnchorListHTML(id, target) {
-       var inst = tinyMCEPopup.editor;
-       var nodes = inst.dom.select('a.mceItemAnchor,img.mceItemAnchor'), name, i;
-       var html = "";
-
-       html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" o2nfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';
-       html += 'this.options[this.selectedIndex].value;">';
-       html += '<option value="">---</option>';
-
-       for (i=0; i<nodes.length; i++) {
-               if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")
-                       html += '<option value="#' + name + '">' + name + '</option>';
-       }
-
-       html += '</select>';
-
-       return html;
-}
-
-function insertAction() {
-       var inst = tinyMCEPopup.editor;
-       var elm, elementArray, i;
-
-       elm = inst.selection.getNode();
-       checkPrefix(document.forms[0].href);
-
-       elm = inst.dom.getParent(elm, "A");
-
-       // Remove element if there is no href
-       if (!document.forms[0].href.value) {
-               tinyMCEPopup.execCommand("mceBeginUndoLevel");
-               i = inst.selection.getBookmark();
-               inst.dom.remove(elm, 1);
-               inst.selection.moveToBookmark(i);
-               tinyMCEPopup.execCommand("mceEndUndoLevel");
-               tinyMCEPopup.close();
-               return;
-       }
-
-       tinyMCEPopup.execCommand("mceBeginUndoLevel");
-
-       // Create new anchor elements
-       if (elm == null) {
-               inst.getDoc().execCommand("unlink", false, null);
-               tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
-
-               elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});
-               for (i=0; i<elementArray.length; i++)
-                       setAllAttribs(elm = elementArray[i]);
-       } else
-               setAllAttribs(elm);
-
-       // Don't move caret if selection was image
-       if (elm.childNodes.length != 1 || elm.firstChild.nodeName != 'IMG') {
-               inst.focus();
-               inst.selection.select(elm);
-               inst.selection.collapse(0);
-               tinyMCEPopup.storeSelection();
-       }
-
-       tinyMCEPopup.execCommand("mceEndUndoLevel");
-       tinyMCEPopup.close();
-}
-
-function setAllAttribs(elm) {
-       var formObj = document.forms[0];
-       var href = formObj.href.value;
-       var target = getSelectValue(formObj, 'targetlist');
-
-       setAttrib(elm, 'href', href);
-       setAttrib(elm, 'title');
-       setAttrib(elm, 'target', target == '_self' ? '' : target);
-       setAttrib(elm, 'id');
-       setAttrib(elm, 'style');
-       setAttrib(elm, 'class', getSelectValue(formObj, 'classlist'));
-       setAttrib(elm, 'rel');
-       setAttrib(elm, 'rev');
-       setAttrib(elm, 'charset');
-       setAttrib(elm, 'hreflang');
-       setAttrib(elm, 'dir');
-       setAttrib(elm, 'lang');
-       setAttrib(elm, 'tabindex');
-       setAttrib(elm, 'accesskey');
-       setAttrib(elm, 'type');
-       setAttrib(elm, 'onfocus');
-       setAttrib(elm, 'onblur');
-       setAttrib(elm, 'onclick');
-       setAttrib(elm, 'ondblclick');
-       setAttrib(elm, 'onmousedown');
-       setAttrib(elm, 'onmouseup');
-       setAttrib(elm, 'onmouseover');
-       setAttrib(elm, 'onmousemove');
-       setAttrib(elm, 'onmouseout');
-       setAttrib(elm, 'onkeypress');
-       setAttrib(elm, 'onkeydown');
-       setAttrib(elm, 'onkeyup');
-
-       // Refresh in old MSIE
-       if (tinyMCE.isMSIE5)
-               elm.outerHTML = elm.outerHTML;
-}
-
-function getSelectValue(form_obj, field_name) {
-       var elm = form_obj.elements[field_name];
-
-       if (!elm || elm.options == null || elm.selectedIndex == -1)
-               return "";
-
-       return elm.options[elm.selectedIndex].value;
-}
-
-function getLinkListHTML(elm_id, target_form_element, onchange_func) {
-       if (typeof(tinyMCELinkList) == "undefined" || tinyMCELinkList.length == 0)
-               return "";
-
-       var html = "";
-
-       html += '<select id="' + elm_id + '" name="' + elm_id + '"';
-       html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
-       html += 'this.options[this.selectedIndex].value;';
-
-       if (typeof(onchange_func) != "undefined")
-               html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
-
-       html += '"><option value="">---</option>';
-
-       for (var i=0; i<tinyMCELinkList.length; i++)
-               html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
-
-       html += '</select>';
-
-       return html;
-
-       // tinyMCE.debug('-- image list start --', html, '-- image list end --');
-}
-
-function getTargetListHTML(elm_id, target_form_element) {
-       var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
-       var html = '';
-
-       html += '<select id="' + elm_id + '" name="' + elm_id + '" onf2ocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
-       html += 'this.options[this.selectedIndex].value;">';
-       html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
-       html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';
-       html += '<option value="_parent">' + tinyMCEPopup.getLang('advlink_dlg.target_parent') + ' (_parent)</option>';
-       html += '<option value="_top">' + tinyMCEPopup.getLang('advlink_dlg.target_top') + ' (_top)</option>';
-
-       for (var i=0; i<targets.length; i++) {
-               var key, value;
-
-               if (targets[i] == "")
-                       continue;
-
-               key = targets[i].split('=')[0];
-               value = targets[i].split('=')[1];
-
-               html += '<option value="' + key + '">' + value + ' (' + key + ')</option>';
-       }
-
-       html += '</select>';
-
-       return html;
-}
-
-// While loading
-preinit();
-tinyMCEPopup.onInit.add(init);
diff --git a/lib/editor/tinymce/plugins/advlink/langs/en_dlg.js b/lib/editor/tinymce/plugins/advlink/langs/en_dlg.js
deleted file mode 100644 (file)
index 8ef9c79..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-tinyMCE.addI18n('en.advlink_dlg',{
-title:"Insert/edit link",
-url:"Link URL",
-target:"Target",
-titlefield:"Title",
-is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
-is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
-list:"Link list",
-general_tab:"General",
-popup_tab:"Popup",
-events_tab:"Events",
-advanced_tab:"Advanced",
-general_props:"General properties",
-popup_props:"Popup properties",
-event_props:"Events",
-advanced_props:"Advanced properties",
-popup_opts:"Options",
-anchor_names:"Anchors",
-target_same:"Open in this window / frame",
-target_parent:"Open in parent window / frame",
-target_top:"Open in top frame (replaces all frames)",
-target_blank:"Open in new window",
-popup:"Javascript popup",
-popup_url:"Popup URL",
-popup_name:"Window name",
-popup_return:"Insert 'return false'",
-popup_scrollbars:"Show scrollbars",
-popup_statusbar:"Show status bar",
-popup_toolbar:"Show toolbars",
-popup_menubar:"Show menu bar",
-popup_location:"Show location bar",
-popup_resizable:"Make window resizable",
-popup_dependent:"Dependent (Mozilla/Firefox only)",
-popup_size:"Size",
-popup_position:"Position (X/Y)",
-id:"Id",
-style:"Style",
-classes:"Classes",
-target_name:"Target name",
-langdir:"Language direction",
-target_langcode:"Target language",
-langcode:"Language code",
-encoding:"Target character encoding",
-mime:"Target MIME type",
-rel:"Relationship page to target",
-rev:"Relationship target to page",
-tabindex:"Tabindex",
-accesskey:"Accesskey",
-ltr:"Left to right",
-rtl:"Right to left",
-link_list:"Link list"
-});
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/advlink/link.htm b/lib/editor/tinymce/plugins/advlink/link.htm
deleted file mode 100644 (file)
index b21a944..0000000
+++ /dev/null
@@ -1,338 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-       <title>{#advlink_dlg.title}</title>
-       <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-       <script type="text/javascript" src="../../utils/mctabs.js"></script>
-       <script type="text/javascript" src="../../utils/form_utils.js"></script>
-       <script type="text/javascript" src="../../utils/validate.js"></script>
-       <script type="text/javascript" src="js/advlink.js"></script>
-       <link href="css/advlink.css" rel="stylesheet" type="text/css" />
-</head>
-<body id="advlink" style="display: none">
-    <form onsubmit="insertAction();return false;" action="#">
-               <div class="tabs">
-                       <ul>
-                               <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>
-                               <li id="popup_tab"><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>
-                               <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>
-                               <li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>
-                       </ul>
-               </div>
-
-               <div class="panel_wrapper">
-                       <div id="general_panel" class="panel current">
-                               <fieldset>
-                                       <legend>{#advlink_dlg.general_props}</legend>
-
-                                       <table border="0" cellpadding="4" cellspacing="0">
-                                               <tr>
-                                                 <td class="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>
-                                                 <td><table border="0" cellspacing="0" cellpadding="0">
-                                                               <tr>
-                                                                 <td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>
-                                                                 <td id="hrefbrowsercontainer">&nbsp;</td>
-                                                               </tr>
-                                                         </table></td>
-                                               </tr>
-                                               <tr id="linklisthrefrow">
-                                                       <td class="column1"><label for="linklisthref">{#advlink_dlg.list}</label></td>
-                                                       <td colspan="2" id="linklisthrefcontainer"><select id="linklisthref"><option value=""></option></select></td>
-                                               </tr>
-                                               <tr>
-                                                       <td class="column1"><label for="anchorlist">{#advlink_dlg.anchor_names}</label></td>
-                                                       <td colspan="2" id="anchorlistcontainer"><select id="anchorlist"><option value=""></option></select></td>
-                                               </tr>
-                                               <tr>
-                                                       <td><label id="targetlistlabel" for="targetlist">{#advlink_dlg.target}</label></td>
-                                                       <td id="targetlistcontainer"><select id="targetlist"><option value=""></option></select></td>
-                                               </tr>
-                                               <tr>
-                                                       <td class="nowrap"><label id="titlelabel" for="title">{#advlink_dlg.titlefield}</label></td>
-                                                       <td><input id="title" name="title" type="text" value="" /></td>
-                                               </tr>
-                                               <tr>
-                                                       <td><label id="classlabel" for="classlist">{#class_name}</label></td>
-                                                       <td>
-                                                                <select id="classlist" name="classlist" onchange="changeClass();">
-                                                                       <option value="" selected="selected">{#not_set}</option>
-                                                                </select>
-                                                       </td>
-                                               </tr>
-                                       </table>
-                               </fieldset>
-                       </div>
-
-                       <div id="popup_panel" class="panel">
-                               <fieldset>
-                                       <legend>{#advlink_dlg.popup_props}</legend>
-
-                                       <input type="checkbox" id="ispopup" name="ispopup" class="radio" onclick="setPopupControlsDisabled(!this.checked);buildOnClick();" />
-                                       <label id="ispopuplabel" for="ispopup">{#advlink_dlg.popup}</label>
-
-                                       <table border="0" cellpadding="0" cellspacing="4">
-                                               <tr>
-                                                       <td class="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>
-                                                       <td>
-                                                               <table border="0" cellspacing="0" cellpadding="0">
-                                                                       <tr>
-                                                                               <td><input type="text" name="popupurl" id="popupurl" value="" onchange="buildOnClick();" /></td>
-                                                                               <td id="popupurlbrowsercontainer">&nbsp;</td>
-                                                                       </tr>
-                                                               </table>
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td class="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>
-                                                       <td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>
-                                               </tr>
-                                               <tr>
-                                                       <td class="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>
-                                                       <td class="nowrap">
-                                                               <input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x
-                                                               <input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td class="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>
-                                                       <td class="nowrap">
-                                                               <input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                
-                                                               <input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)
-                                                       </td>
-                                               </tr>
-                                       </table>
-
-                                       <fieldset>
-                                               <legend>{#advlink_dlg.popup_opts}</legend>
-
-                                               <table border="0" cellpadding="0" cellspacing="4">
-                                                       <tr>
-                                                               <td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>
-                                                               <td class="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>
-                                                               <td><input type="checkbox" id="popupscrollbars" name="popupscrollbars" class="checkbox" onchange="buildOnClick();" /></td>
-                                                               <td class="nowrap"><label id="popupscrollbarslabel" for="popupscrollbars">{#advlink_dlg.popup_scrollbars}</label></td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td><input type="checkbox" id="popupmenubar" name="popupmenubar" class="checkbox" onchange="buildOnClick();" /></td>
-                                                               <td class="nowrap"><label id="popupmenubarlabel" for="popupmenubar">{#advlink_dlg.popup_menubar}</label></td>
-                                                               <td><input type="checkbox" id="popupresizable" name="popupresizable" class="checkbox" onchange="buildOnClick();" /></td>
-                                                               <td class="nowrap"><label id="popupresizablelabel" for="popupresizable">{#advlink_dlg.popup_resizable}</label></td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td><input type="checkbox" id="popuptoolbar" name="popuptoolbar" class="checkbox" onchange="buildOnClick();" /></td>
-                                                               <td class="nowrap"><label id="popuptoolbarlabel" for="popuptoolbar">{#advlink_dlg.popup_toolbar}</label></td>
-                                                               <td><input type="checkbox" id="popupdependent" name="popupdependent" class="checkbox" onchange="buildOnClick();" /></td>
-                                                               <td class="nowrap"><label id="popupdependentlabel" for="popupdependent">{#advlink_dlg.popup_dependent}</label></td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td><input type="checkbox" id="popupstatus" name="popupstatus" class="checkbox" onchange="buildOnClick();" /></td>
-                                                               <td class="nowrap"><label id="popupstatuslabel" for="popupstatus">{#advlink_dlg.popup_statusbar}</label></td>
-                                                               <td><input type="checkbox" id="popupreturn" name="popupreturn" class="checkbox" onchange="buildOnClick();" checked="checked" /></td>
-                                                               <td class="nowrap"><label id="popupreturnlabel" for="popupreturn">{#advlink_dlg.popup_return}</label></td>
-                                                       </tr>
-                                               </table>
-                                       </fieldset>
-                               </fieldset>
-                       </div>
-
-                       <div id="advanced_panel" class="panel">
-                       <fieldset>
-                                       <legend>{#advlink_dlg.advanced_props}</legend>
-
-                                       <table border="0" cellpadding="0" cellspacing="4">
-                                               <tr>
-                                                       <td class="column1"><label id="idlabel" for="id">{#advlink_dlg.id}</label></td> 
-                                                       <td><input id="id" name="id" type="text" value="" /></td> 
-                                               </tr>
-
-                                               <tr>
-                                                       <td><label id="stylelabel" for="style">{#advlink_dlg.style}</label></td>
-                                                       <td><input type="text" id="style" name="style" value="" /></td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td><label id="classeslabel" for="classes">{#advlink_dlg.classes}</label></td>
-                                                       <td><input type="text" id="classes" name="classes" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td><label id="targetlabel" for="target">{#advlink_dlg.target_name}</label></td>
-                                                       <td><input type="text" id="target" name="target" value="" onchange="selectByValue(this.form,'targetlist',this.value,true);" /></td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="dirlabel" for="dir">{#advlink_dlg.langdir}</label></td> 
-                                                       <td>
-                                                               <select id="dir" name="dir"> 
-                                                                               <option value="">{#not_set}</option> 
-                                                                               <option value="ltr">{#advlink_dlg.ltr}</option> 
-                                                                               <option value="rtl">{#advlink_dlg.rtl}</option> 
-                                                               </select>
-                                                       </td> 
-                                               </tr>
-
-                                               <tr>
-                                                       <td><label id="hreflanglabel" for="hreflang">{#advlink_dlg.target_langcode}</label></td>
-                                                       <td><input type="text" id="hreflang" name="hreflang" value="" /></td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td class="column1"><label id="langlabel" for="lang">{#advlink_dlg.langcode}</label></td> 
-                                                       <td>
-                                                               <input id="lang" name="lang" type="text" value="" />
-                                                       </td> 
-                                               </tr>
-
-                                               <tr>
-                                                       <td><label id="charsetlabel" for="charset">{#advlink_dlg.encoding}</label></td>
-                                                       <td><input type="text" id="charset" name="charset" value="" /></td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td><label id="typelabel" for="type">{#advlink_dlg.mime}</label></td>
-                                                       <td><input type="text" id="type" name="type" value="" /></td>
-                                               </tr>
-
-                                               <tr>
-                                                       <td><label id="rellabel" for="rel">{#advlink_dlg.rel}</label></td>
-                                                       <td><select id="rel" name="rel"> 
-                                                                       <option value="">{#not_set}</option> 
-                                                                       <option value="lightbox">Lightbox</option> 
-                                                                       <option value="alternate">Alternate</option> 
-                                                                       <option value="designates">Designates</option> 
-                                                                       <option value="stylesheet">Stylesheet</option> 
-                                                                       <option value="start">Start</option> 
-                                                                       <option value="next">Next</option> 
-                                                                       <option value="prev">Prev</option> 
-                                                                       <option value="contents">Contents</option> 
-                                                                       <option value="index">Index</option> 
-                                                                       <option value="glossary">Glossary</option> 
-                                                                       <option value="copyright">Copyright</option> 
-                                                                       <option value="chapter">Chapter</option> 
-                                                                       <option value="subsection">Subsection</option> 
-                                                                       <option value="appendix">Appendix</option> 
-                                                                       <option value="help">Help</option> 
-                                                                       <option value="bookmark">Bookmark</option>
-                                                                       <option value="nofollow">No Follow</option>
-                                                                       <option value="tag">Tag</option>
-                                                               </select> 
-                                                       </td>
-                                               </tr>
-
-                                               <tr>
-    &n