From 2c633703e97eb6e7aa7ba840ef86b1fc1bd98ada Mon Sep 17 00:00:00 2001 From: svncommit Date: Thu, 24 May 2007 03:49:19 +0000 Subject: upgrade to TinyMCE v2.1.1.1 --- program/js/tiny_mce/tiny_mce_src.js | 3577 ++++++++++++++++++----------------- 1 file changed, 1828 insertions(+), 1749 deletions(-) (limited to 'program/js/tiny_mce/tiny_mce_src.js') diff --git a/program/js/tiny_mce/tiny_mce_src.js b/program/js/tiny_mce/tiny_mce_src.js index 9f8de6e12..ba713a897 100644 --- a/program/js/tiny_mce/tiny_mce_src.js +++ b/program/js/tiny_mce/tiny_mce_src.js @@ -5,22 +5,23 @@ function TinyMCE_Engine() { var ua; this.majorVersion = "2"; - this.minorVersion = "1.0"; - this.releaseDate = "2007-02-13"; - - this.instances = new Array(); - this.switchClassCache = new Array(); - this.windowArgs = new Array(); - this.loadedFiles = new Array(); - this.pendingFiles = new Array(); + this.minorVersion = "1.1.1"; + this.releaseDate = "2007-05-14"; + + this.instances = []; + this.switchClassCache = []; + this.windowArgs = []; + this.loadedFiles = []; + this.pendingFiles = []; this.loadingIndex = 0; - this.configs = new Array(); + this.configs = []; this.currentConfig = 0; - this.eventHandlers = new Array(); - this.log = new Array(); + this.eventHandlers = []; + this.log = []; this.undoLevels = []; this.undoIndex = 0; this.typingUndoIndex = -1; + this.settings = []; // Browser check ua = navigator.userAgent; @@ -28,18 +29,18 @@ function TinyMCE_Engine() { this.isMSIE5 = this.isMSIE && (ua.indexOf('MSIE 5') != -1); this.isMSIE5_0 = this.isMSIE && (ua.indexOf('MSIE 5.0') != -1); this.isMSIE7 = this.isMSIE && (ua.indexOf('MSIE 7') != -1); - this.isGecko = ua.indexOf('Gecko') != -1; + this.isGecko = ua.indexOf('Gecko') != -1; // Will also be true on Safari this.isSafari = ua.indexOf('Safari') != -1; - this.isOpera = ua.indexOf('Opera') != -1; + this.isOpera = window['opera'] && opera.buildNumber ? true : false; this.isMac = ua.indexOf('Mac') != -1; this.isNS7 = ua.indexOf('Netscape/7') != -1; this.isNS71 = ua.indexOf('Netscape/7.1') != -1; this.dialogCounter = 0; - this.plugins = new Array(); - this.themes = new Array(); - this.menus = new Array(); - this.loadedPlugins = new Array(); - this.buttonMap = new Array(); + this.plugins = []; + this.themes = []; + this.menus = []; + this.loadedPlugins = []; + this.buttonMap = []; this.isLoaded = false; // Fake MSIE on Opera and if Opera fakes IE, Gecko or Safari cancel those @@ -58,7 +59,7 @@ function TinyMCE_Engine() { TinyMCE_Engine.prototype = { init : function(settings) { - var theme, nl, baseHREF = "", i; + var theme, nl, baseHREF = "", i, cssPath, entities, h, p, src, elements = [], head; // IE 5.0x is no longer supported since 5.5, 6.0 and 7.0 now exists. We can't support old browsers forever, sorry. if (this.isMSIE5_0) @@ -72,7 +73,17 @@ TinyMCE_Engine.prototype = { // Get script base path if (!tinyMCE.baseURL) { - var elements = document.getElementsByTagName('script'); + // Search through head + head = document.getElementsByTagName('head')[0]; + + if (head) { + for (i=0, nl = head.getElementsByTagName('script'); i 0 && document.location.protocol != "file:") { p = h.indexOf('/', p + 3); h = h.substring(0, p); @@ -225,66 +237,54 @@ TinyMCE_Engine.prototype = { if (baseHREF.indexOf('://') == -1) baseHREF = h + baseHREF; - tinyMCE.settings['document_base_url'] = baseHREF; - tinyMCE.settings['document_base_prefix'] = h; + tinyMCE.settings.document_base_url = baseHREF; + tinyMCE.settings.document_base_prefix = h; } // Trim away query part if (baseHREF.indexOf('?') != -1) baseHREF = baseHREF.substring(0, baseHREF.indexOf('?')); - this.settings['base_href'] = baseHREF.substring(0, baseHREF.lastIndexOf('/')) + "/"; + this.settings.base_href = baseHREF.substring(0, baseHREF.lastIndexOf('/')) + "/"; - theme = this.settings['theme']; + theme = this.settings.theme; this.inlineStrict = 'A|BR|SPAN|BDO|MAP|OBJECT|IMG|TT|I|B|BIG|SMALL|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|#text|#comment'; this.inlineTransitional = 'A|BR|SPAN|BDO|OBJECT|APPLET|IMG|MAP|IFRAME|TT|I|B|U|S|STRIKE|BIG|SMALL|FONT|BASEFONT|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|INPUT|SELECT|TEXTAREA|LABEL|BUTTON|#text|#comment'; - this.blockElms = 'H[1-6]|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|FORM|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP'; + this.blockElms = 'H[1-6]|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|FORM|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP'; this.blockRegExp = new RegExp("^(" + this.blockElms + ")$", "i"); - this.posKeyCodes = new Array(13,45,36,35,33,34,37,38,39,40); + this.posKeyCodes = [13,45,36,35,33,34,37,38,39,40]; this.uniqueURL = 'javascript:void(091039730);'; // Make unique URL non real URL this.uniqueTag = ''; - this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup', 'removeInstance'); + this.callbacks = ['onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup', 'removeInstance']; // Theme url - this.settings['theme_href'] = tinyMCE.baseURL + "/themes/" + theme; + this.settings.theme_href = tinyMCE.baseURL + "/themes/" + theme; if (!tinyMCE.isIE || tinyMCE.isOpera) - this.settings['force_br_newlines'] = false; + this.settings.force_br_newlines = false; if (tinyMCE.getParam("popups_css", false)) { - var cssPath = tinyMCE.getParam("popups_css", ""); + cssPath = tinyMCE.getParam("popups_css", ""); // Is relative if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/') - this.settings['popups_css'] = this.documentBasePath + "/" + cssPath; + this.settings.popups_css = this.documentBasePath + "/" + cssPath; else - this.settings['popups_css'] = cssPath; + this.settings.popups_css = cssPath; } else - this.settings['popups_css'] = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_popup.css"; + this.settings.popups_css = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_popup.css"; if (tinyMCE.getParam("editor_css", false)) { - var cssPath = tinyMCE.getParam("editor_css", ""); + cssPath = tinyMCE.getParam("editor_css", ""); // Is relative if (cssPath.indexOf('://') == -1 && cssPath.charAt(0) != '/') - this.settings['editor_css'] = this.documentBasePath + "/" + cssPath; + this.settings.editor_css = this.documentBasePath + "/" + cssPath; else - this.settings['editor_css'] = cssPath; + this.settings.editor_css = cssPath; } else { - if (this.settings.editor_css != '') - this.settings['editor_css'] = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_ui.css"; - } - - if (tinyMCE.settings['debug']) { - var msg = "Debug: \n"; - - msg += "baseURL: " + this.baseURL + "\n"; - msg += "documentBasePath: " + this.documentBasePath + "\n"; - msg += "content_css: " + this.settings['content_css'] + "\n"; - msg += "popups_css: " + this.settings['popups_css'] + "\n"; - msg += "editor_css: " + this.settings['editor_css'] + "\n"; - - alert(msg); + if (this.settings.editor_css !== '') + this.settings.editor_css = tinyMCE.baseURL + "/themes/" + theme + "/css/editor_ui.css"; } // Only do this once @@ -304,14 +304,14 @@ TinyMCE_Engine.prototype = { } } - this.loadScript(tinyMCE.baseURL + '/themes/' + this.settings['theme'] + '/editor_template' + tinyMCE.srcMode + '.js'); - this.loadScript(tinyMCE.baseURL + '/langs/' + this.settings['language'] + '.js'); - this.loadCSS(this.settings['editor_css']); + this.loadScript(tinyMCE.baseURL + '/themes/' + this.settings.theme + '/editor_template' + tinyMCE.srcMode + '.js'); + this.loadScript(tinyMCE.baseURL + '/langs/' + this.settings.language + '.js'); + this.loadCSS(this.settings.editor_css); // Add plugins - var p = tinyMCE.getParam('plugins', '', true, ','); + p = tinyMCE.getParam('plugins', '', true, ','); if (p.length > 0) { - for (var i=0; i&"\']', 'g'); this.xmlEncodeRe = new RegExp('[<>&"]', 'g'); -// this.xmlEncodeEnts = {'&':'&','"':'"',"'":''','<':'<','>':'>'}; }, _addUnloadEvents : function() { + var st = tinyMCE.settings.add_unload_trigger; + if (tinyMCE.isIE) { - if (tinyMCE.settings['add_unload_trigger']) { + if (st) { tinyMCE.addEvent(window, "unload", TinyMCE_Engine.prototype.unloadHandler); tinyMCE.addEvent(window.document, "beforeunload", TinyMCE_Engine.prototype.unloadHandler); } } else { - if (tinyMCE.settings['add_unload_trigger']) + if (st) tinyMCE.addEvent(window, "unload", function () {tinyMCE.triggerSave(true, true);}); } }, @@ -449,8 +450,7 @@ TinyMCE_Engine.prototype = { loadCSS : function(url) { var ar = url.replace(/\s+/, '').split(','); - var lflen = 0, csslen = 0; - var skip = false; + var lflen = 0, csslen = 0, skip = false; var x = 0, i = 0, nl, le; for (x = 0,csslen = ar.length; x", "gi"); content = tinyMCE.regexpReplace(content, "\r", "
", "gi"); content = tinyMCE.regexpReplace(content, "\n", "
", "gi"); @@ -951,10 +966,10 @@ TinyMCE_Engine.prototype = { // Ugly!!! window.setInterval('try{tinyMCE.getCSSClasses(tinyMCE.instances["' + editor_id + '"].getDoc(), "' + editor_id + '");}catch(e){}', 500); - if (tinyMCE.settings["force_br_newlines"]) + if (tinyMCE.settings.force_br_newlines) doc.styleSheets[0].addRule("p", "margin: 0;"); - var body = inst.getBody(); + body = inst.getBody(); body.editorId = editor_id; } @@ -962,27 +977,27 @@ TinyMCE_Engine.prototype = { // Fix for bug #958637 if (!tinyMCE.isIE) { - var contentElement = inst.getDoc().createElement("body"); - var doc = inst.getDoc(); + contentElement = inst.getDoc().createElement("body"); + doc = inst.getDoc(); contentElement.innerHTML = content; - // Remove weridness! - if (tinyMCE.isGecko && tinyMCE.settings['remove_lt_gt']) - content = content.replace(new RegExp('<>', 'g'), ""); - - if (tinyMCE.settings['cleanup_on_startup']) + if (tinyMCE.settings.cleanup_on_startup) tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, doc, this.settings, contentElement)); else tinyMCE.setInnerHTML(inst.getBody(), content); tinyMCE.convertAllRelativeURLs(inst.getBody()); } else { - if (tinyMCE.settings['cleanup_on_startup']) { + if (tinyMCE.settings.cleanup_on_startup) { tinyMCE._setHTML(inst.getDoc(), content); // Produces permission denied error in MSIE 5.5 - eval('try {tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, inst.contentDocument, this.settings, inst.getBody()));} catch(e) {}'); + try { + tinyMCE.setInnerHTML(inst.getBody(), tinyMCE._cleanupHTML(inst, inst.contentDocument, this.settings, inst.getBody())); + } catch(e) { + // Ignore + } } else tinyMCE._setHTML(inst.getDoc(), content); } @@ -990,7 +1005,7 @@ TinyMCE_Engine.prototype = { // Fix for bug #957681 //inst.getDoc().designMode = inst.getDoc().designMode; - tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings['visual'], inst); + tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings.visual, inst); tinyMCE.dispatchCallback(inst, 'setupcontent_callback', 'setupContent', editor_id, inst.getBody(), inst.getDoc()); // Re-add design mode on mozilla @@ -1106,7 +1121,7 @@ TinyMCE_Engine.prototype = { }, handleEvent : function(e) { - var inst = tinyMCE.selectedInstance; + var inst = tinyMCE.selectedInstance, i, elm, keys; // Remove odd, error if (typeof(tinyMCE) == "undefined") @@ -1149,19 +1164,17 @@ TinyMCE_Engine.prototype = { } } - window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings['base_href']);tinyMCE._resetIframeHeight();", 1); + window.setTimeout("tinyMCE.selectedInstance.setBaseHREF(tinyMCE.settings.base_href);tinyMCE._resetIframeHeight();", 1); return; case "submit": - tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE ? window.event.srcElement : e.target); - tinyMCE.triggerSave(); - tinyMCE.isNotDirty = true; + tinyMCE.formSubmit(tinyMCE.isMSIE ? window.event.srcElement : e.target); return; case "reset": var formObj = tinyMCE.isIE ? window.event.srcElement : e.target; - for (var i=0; i'; - h += ''; + h += '{$'+lang+'}'; h += ''; } else { // Normal button h += ''; - h += ''; + h += '{$'+lang+'}'; h += ''; } @@ -1500,15 +1516,45 @@ TinyMCE_Engine.prototype = { this.buttonMap[a[i]] = i; }, + formSubmit : function(f, p) { + var n, inst, found = false; + + if (f.form) + f = f.form; + + // Is it a form that has a TinyMCE instance + for (n in tinyMCE.instances) { + inst = tinyMCE.instances[n]; + + if (!tinyMCE.isInstance(inst)) + continue; + + if (inst.formElement) { + if (f == inst.formElement.form) { + found = true; + inst.isNotDirty = true; + } + } + } + + // Is valid + if (found) { + tinyMCE.removeTinyMCEFormElements(f); + tinyMCE.triggerSave(); + } + + // Is it patched + if (f.mceOldSubmit && p) + f.mceOldSubmit(); + }, + submitPatch : function() { - tinyMCE.removeTinyMCEFormElements(this); - tinyMCE.triggerSave(); - tinyMCE.isNotDirty = true; - this.mceOldSubmit(); + tinyMCE.formSubmit(this, true); }, onLoad : function() { - var r; + var r, i, c, mode, trigger, elements, element, settings, elementId, elm; + var selector, deselector, elementRefAr, form; // Wait for everything to be loaded first if (tinyMCE.settings.strict_loading_mode && this.loadingIndex != -1) { @@ -1527,7 +1573,7 @@ TinyMCE_Engine.prototype = { // IE produces JS error if TinyMCE is placed in a frame // It seems to have something to do with the selection not beeing // correctly initialized in IE so this hack solves the problem - if (tinyMCE.isRealIE && document.body) { + if (tinyMCE.isRealIE && document.body && window.location.href != window.top.location.href) { r = document.body.createTextRange(); r.collapse(true); r.select(); @@ -1535,24 +1581,24 @@ TinyMCE_Engine.prototype = { tinyMCE.dispatchCallback(null, 'onpageload', 'onPageLoad'); - for (var c=0; c 0); - if (tinyMCE.settings['custom_undo_redo']) { + if (tinyMCE.settings.custom_undo_redo) { undoIndex = inst.undoRedo.undoIndex; undoLevels = inst.undoRedo.undoLevels.length; } @@ -1756,15 +1799,15 @@ TinyMCE_Engine.prototype = { }, _customCleanup : function(inst, type, content) { - var pl, po, i; + var pl, po, i, customCleanup; // Call custom cleanup - var customCleanup = tinyMCE.settings['cleanup_callback']; - if (customCleanup != "" && eval("typeof(" + customCleanup + ")") != "undefined") - content = eval(customCleanup + "(type, content, inst);"); + customCleanup = tinyMCE.settings.cleanup_callback; + if (customCleanup != '') + content = tinyMCE.resolveDots(tinyMCE.settings.cleanup_callback, window)(type, content, inst); // Trigger theme cleanup - po = tinyMCE.themes[tinyMCE.settings['theme']]; + po = tinyMCE.themes[tinyMCE.settings.theme]; if (po && po.cleanup) content = po.cleanup(type, content, inst); @@ -1789,9 +1832,9 @@ TinyMCE_Engine.prototype = { importThemeLanguagePack : function(name) { if (typeof(name) == "undefined") - name = tinyMCE.settings['theme']; + name = tinyMCE.settings.theme; - tinyMCE.loadScript(tinyMCE.baseURL + '/themes/' + name + '/langs/' + tinyMCE.settings['language'] + '.js'); + tinyMCE.loadScript(tinyMCE.baseURL + '/themes/' + name + '/langs/' + tinyMCE.settings.language + '.js'); }, importPluginLanguagePack : function(name) { @@ -1800,16 +1843,16 @@ TinyMCE_Engine.prototype = { if (this.plugins[name]) b = this.plugins[name].baseURL; - tinyMCE.loadScript(b + '/langs/' + tinyMCE.settings['language'] + '.js'); + tinyMCE.loadScript(b + '/langs/' + tinyMCE.settings.language + '.js'); }, - applyTemplate : function(h, as) { + applyTemplate : function(h, ag) { return h.replace(new RegExp('\\{\\$([a-z0-9_]+)\\}', 'gi'), function(m, s) { if (s.indexOf('lang_') == 0 && tinyMCELang[s]) return tinyMCELang[s]; - if (as && as[s]) - return as[s]; + if (ag && ag[s]) + return ag[s]; if (tinyMCE.settings[s]) return tinyMCE.settings[s]; @@ -1826,20 +1869,20 @@ TinyMCE_Engine.prototype = { }, openWindow : function(template, args) { - var html, width, height, x, y, resizable, scrollbars, url; + var html, width, height, x, y, resizable, scrollbars, url, name, win, modal, features; args = !args ? {} : args; - args['mce_template_file'] = template['file']; - args['mce_width'] = template['width']; - args['mce_height'] = template['height']; + args.mce_template_file = template.file; + args.mce_width = template.width; + args.mce_height = template.height; tinyMCE.windowArgs = args; - html = template['html']; - if (!(width = parseInt(template['width']))) + html = template.html; + if (!(width = parseInt(template.width))) width = 320; - if (!(height = parseInt(template['height']))) + if (!(height = parseInt(template.height))) height = 200; // Add to height in M$ due to SP2 WHY DON'T YOU GUYS IMPLEMENT innerWidth of windows!! @@ -1851,16 +1894,16 @@ TinyMCE_Engine.prototype = { x = parseInt(screen.width / 2.0) - (width / 2.0); y = parseInt(screen.height / 2.0) - (height / 2.0); - resizable = (args && args['resizable']) ? args['resizable'] : "no"; - scrollbars = (args && args['scrollbars']) ? args['scrollbars'] : "no"; + resizable = (args && args.resizable) ? args.resizable : "no"; + scrollbars = (args && args.scrollbars) ? args.scrollbars : "no"; - if (template['file'].charAt(0) != '/' && template['file'].indexOf('://') == -1) - url = tinyMCE.baseURL + "/themes/" + tinyMCE.getParam("theme") + "/" + template['file']; + if (template.file.charAt(0) != '/' && template.file.indexOf('://') == -1) + url = tinyMCE.baseURL + "/themes/" + tinyMCE.getParam("theme") + "/" + template.file; else - url = template['file']; + url = template.file; // Replace all args as variables in URL - for (var name in args) { + for (name in args) { if (typeof(args[name]) == 'function') continue; @@ -1868,12 +1911,12 @@ TinyMCE_Engine.prototype = { } if (html) { - html = tinyMCE.replaceVar(html, "css", this.settings['popups_css']); + html = tinyMCE.replaceVar(html, "css", this.settings.popups_css); html = tinyMCE.applyTemplate(html, args); - var win = window.open("", "mcePopup" + new Date().getTime(), "top=" + y + ",left=" + x + ",scrollbars=" + scrollbars + ",dialog=yes,minimizable=" + resizable + ",modal=yes,width=" + width + ",height=" + height + ",resizable=" + resizable); + win = window.open("", "mcePopup" + new Date().getTime(), "top=" + y + ",left=" + x + ",scrollbars=" + scrollbars + ",dialog=yes,minimizable=" + resizable + ",modal=yes,width=" + width + ",height=" + height + ",resizable=" + resizable); if (win == null) { - alert(tinyMCELang['lang_popup_blocked']); + alert(tinyMCELang.lang_popup_blocked); return; } @@ -1882,34 +1925,35 @@ TinyMCE_Engine.prototype = { win.resizeTo(width, height); win.focus(); } else { - if ((tinyMCE.isRealIE) && resizable != 'yes' && tinyMCE.settings["dialog_type"] == "modal") { + if ((tinyMCE.isRealIE) && resizable != 'yes' && tinyMCE.settings.dialog_type == "modal") { height += 10; - var features = "resizable:" + resizable - + ";scroll:" - + scrollbars + ";status:yes;center:yes;help:no;dialogWidth:" - + width + "px;dialogHeight:" + height + "px;"; + features = "resizable:" + resizable + ";scroll:" + scrollbars + ";status:yes;center:yes;help:no;dialogWidth:" + width + "px;dialogHeight:" + height + "px;"; window.showModalDialog(url, window, features); } else { - var modal = (resizable == "yes") ? "no" : "yes"; + modal = (resizable == "yes") ? "no" : "yes"; if (tinyMCE.isGecko && tinyMCE.isMac) modal = "no"; - if (template['close_previous'] != "no") + if (template.close_previous != "no") try {tinyMCE.lastWindow.close();} catch (ex) {} - var win = window.open(url, "mcePopup" + new Date().getTime(), "top=" + y + ",left=" + x + ",scrollbars=" + scrollbars + ",dialog=" + modal + ",minimizable=" + resizable + ",modal=" + modal + ",width=" + width + ",height=" + height + ",resizable=" + resizable); + win = window.open(url, "mcePopup" + new Date().getTime(), "top=" + y + ",left=" + x + ",scrollbars=" + scrollbars + ",dialog=" + modal + ",minimizable=" + resizable + ",modal=" + modal + ",width=" + width + ",height=" + height + ",resizable=" + resizable); if (win == null) { - alert(tinyMCELang['lang_popup_blocked']); + alert(tinyMCELang.lang_popup_blocked); return; } - if (template['close_previous'] != "no") + if (template.close_previous != "no") tinyMCE.lastWindow = win; - eval('try { win.resizeTo(width, height); } catch(e) { }'); + try { + win.resizeTo(width, height); + } catch(e) { + // Ignore + } // Make it bigger if statusbar is forced if (tinyMCE.isGecko) { @@ -1927,19 +1971,19 @@ TinyMCE_Engine.prototype = { }, getVisualAidClass : function(class_name, state) { - var aidClass = tinyMCE.settings['visual_table_class']; + var i, classNames, ar, className, aidClass = tinyMCE.settings.visual_table_class; if (typeof(state) == "undefined") - state = tinyMCE.settings['visual']; + state = tinyMCE.settings.visual; // Split - var classNames = new Array(); - var ar = class_name.split(' '); - for (var i=0; i 0) className += " "; @@ -1959,30 +2003,32 @@ TinyMCE_Engine.prototype = { }, handleVisualAid : function(el, deep, state, inst, skip_dispatch) { + var i, x, y, tableElement, anchorName, oldW, oldH, bo, cn; + if (!el) return; if (!skip_dispatch) tinyMCE.dispatchCallback(inst, 'handle_visual_aid_callback', 'handleVisualAid', el, deep, state, inst); - var tableElement = null; + tableElement = null; switch (el.nodeName) { case "TABLE": - var oldW = el.style.width; - var oldH = el.style.height; - var bo = tinyMCE.getAttrib(el, "border"); + oldW = el.style.width; + oldH = el.style.height; + bo = tinyMCE.getAttrib(el, "border"); - bo = bo == "" || bo == "0" ? true : false; + bo = bo == '' || bo == "0" ? true : false; tinyMCE.setAttrib(el, "class", tinyMCE.getVisualAidClass(tinyMCE.getAttrib(el, "class"), state && bo)); el.style.width = oldW; el.style.height = oldH; - for (var y=0; y', 'gi'), ''); @@ -2112,11 +2127,12 @@ TinyMCE_Engine.prototype = { } // Content duplication bug fix - if (tinyMCE.isIE && tinyMCE.settings['fix_content_duplication']) { + if (tinyMCE.isIE && tinyMCE.settings.fix_content_duplication) { // Remove P elements in P elements - var paras = doc.getElementsByTagName("P"); - for (var i=0; i<\/o:p>", "
"); - html = tinyMCE.regexpReplace(html, " <\/o:p>", ""); - html = tinyMCE.regexpReplace(html, "", ""); - html = tinyMCE.regexpReplace(html, "

<\/p>", ""); - html = tinyMCE.regexpReplace(html, "

<\/p>\r\n

<\/p>", ""); - html = tinyMCE.regexpReplace(html, "

 <\/p>", "
"); - html = tinyMCE.regexpReplace(html, "

\s*(

\s*)?", "

"); - html = tinyMCE.regexpReplace(html, "<\/p>\s*(<\/p>\s*)?", "

"); - }*/ + html = doc.body.innerHTML; // Always set the htmlText output tinyMCE.setInnerHTML(doc.body, html); @@ -2156,6 +2154,7 @@ TinyMCE_Engine.prototype = { getEditorId : function(form_element) { var inst = this.getInstanceById(form_element); + if (!inst) return null; @@ -2163,25 +2162,27 @@ TinyMCE_Engine.prototype = { }, getInstanceById : function(editor_id) { - var inst = this.instances[editor_id]; + var inst = this.instances[editor_id], n; + if (!inst) { - for (var n in tinyMCE.instances) { - var instance = tinyMCE.instances[n]; - if (!tinyMCE.isInstance(instance)) + for (n in tinyMCE.instances) { + inst = tinyMCE.instances[n]; + + if (!tinyMCE.isInstance(inst)) continue; - if (instance.formTargetElementId == editor_id) { - inst = instance; - break; - } + if (inst.formTargetElementId == editor_id) + return inst; } - } + } else + return inst; - return inst; + return null; }, queryInstanceCommandValue : function(editor_id, command) { var inst = tinyMCE.getInstanceById(editor_id); + if (inst) return inst.queryCommandValue(command); @@ -2190,6 +2191,7 @@ TinyMCE_Engine.prototype = { queryInstanceCommandState : function(editor_id, command) { var inst = tinyMCE.getInstanceById(editor_id); + if (inst) return inst.queryCommandState(command); @@ -2205,76 +2207,72 @@ TinyMCE_Engine.prototype = { }, getCSSClasses : function(editor_id, doc) { - var inst = tinyMCE.getInstanceById(editor_id); - - // Is cached, use that - if (inst && inst.cssClasses.length > 0) - return inst.cssClasses; - - if (typeof(editor_id) == "undefined" && typeof(doc) == "undefined") { - var instance; + var i, c, x, rule, styles, rules, csses, selectorText, inst = tinyMCE.getInstanceById(editor_id); + var cssClass, addClass, p; - for (var instanceName in tinyMCE.instances) { - instance = tinyMCE.instances[instanceName]; - if (!tinyMCE.isInstance(instance)) - continue; + if (!inst) + inst = tinyMCE.selectedInstance; - break; - } + if (!inst) + return []; - doc = instance.getDoc(); - } + if (!doc) + doc = inst.getDoc(); - if (typeof(doc) == "undefined") { - var instance = tinyMCE.getInstanceById(editor_id); - doc = instance.getDoc(); - } + // Is cached, use that + if (inst && inst.cssClasses.length > 0) + return inst.cssClasses; - if (doc) { - var styles = doc.styleSheets; + if (!doc) + return; - if (styles && styles.length > 0) { - for (var x=0; x 0) { + for (x=0; x' + tinyMCE.replaceVar(v, "pluginurl", o.baseURL) + ''; @@ -2324,8 +2325,8 @@ TinyMCE_Engine.prototype = { } } - o = tinyMCE.themes[tinyMCE.settings['theme']]; - if (o.getControlHTML && (v = o.getControlHTML(c)) != '') { + o = tinyMCE.themes[tinyMCE.settings.theme]; + if (o.getControlHTML && (v = o.getControlHTML(c)) !== '') { if (rtl) return '' + v + ''; @@ -2361,7 +2362,7 @@ TinyMCE_Engine.prototype = { l = tinyMCE.getParam(p, ''); - if (l != '' && (v = tinyMCE.evalFunc(l, 3, a)) == s && m > 0) + if (l !== '' && (v = tinyMCE.evalFunc(l, 3, a)) == s && m > 0) return true; if (ins != null) { @@ -2384,8 +2385,20 @@ TinyMCE_Engine.prototype = { return false; }, - xmlEncode : function(s, skip_apos) { - return s ? ('' + s).replace(!skip_apos ? this.xmlEncodeAposRe : this.xmlEncodeRe, function (c, b) { + resolveDots : function(s, o) { + var i; + + if (typeof(s) == 'string') { + for (i=0, s=s.split('.'); i 0) { for (i=0; i 1 && tinyMCE.currentConfig != this.settings['index']) { + if (tinyMCE.configs.length > 1 && tinyMCE.currentConfig != this.settings.index) { tinyMCE.settings = this.settings; - tinyMCE.currentConfig = this.settings['index']; + tinyMCE.currentConfig = this.settings.index; } }, @@ -2709,10 +2727,12 @@ TinyMCE_Control.prototype = { isDirty : function() { // Is content modified and not in a submit procedure - return tinyMCE.trim(this.startContent) != tinyMCE.trim(this.getBody().innerHTML) && !tinyMCE.isNotDirty; + return tinyMCE.trim(this.startContent) != tinyMCE.trim(this.getBody().innerHTML) && !this.isNotDirty; }, _mergeElements : function(scmd, pa, ch, override) { + var st, stc, className, n; + if (scmd == "removeformat") { pa.className = ""; pa.style.cssText = ""; @@ -2721,22 +2741,22 @@ TinyMCE_Control.prototype = { return; } - var st = tinyMCE.parseStyle(tinyMCE.getAttrib(pa, "style")); - var stc = tinyMCE.parseStyle(tinyMCE.getAttrib(ch, "style")); - var className = tinyMCE.getAttrib(pa, "class"); + st = tinyMCE.parseStyle(tinyMCE.getAttrib(pa, "style")); + stc = tinyMCE.parseStyle(tinyMCE.getAttrib(ch, "style")); + className = tinyMCE.getAttrib(pa, "class"); // Removed class adding due to bug #1478272 className = tinyMCE.getAttrib(ch, "class"); if (override) { - for (var n in st) { + for (n in st) { if (typeof(st[n]) == 'function') continue; stc[n] = st[n]; } } else { - for (var n in stc) { + for (n in stc) { if (typeof(stc[n]) == 'function') continue; @@ -2752,6 +2772,55 @@ TinyMCE_Control.prototype = { ch.removeAttribute("style"); }, + _fixRootBlocks : function() { + var rb, b, ne, be, nx, bm; + + rb = tinyMCE.getParam('forced_root_block'); + if (!rb) + return; + + b = this.getBody(); + ne = b.firstChild; + + while (ne) { + nx = ne.nextSibling; + + // If text node or inline element wrap it in a block element + if (ne.nodeType == 3 || !tinyMCE.blockRegExp.test(ne.nodeName)) { + if (!bm) + bm = this.selection.getBookmark(); + + if (!be) { + be = this.getDoc().createElement(rb); + be.appendChild(ne.cloneNode(true)); + b.replaceChild(be, ne); + } else { + be.appendChild(ne.cloneNode(true)); + b.removeChild(ne); + } + } else + be = null; + + ne = nx; + } + + if (bm) + this.selection.moveToBookmark(bm); + }, + + _fixTrailingNbsp : function() { + var s = this.selection, e = s.getFocusElement(), bm, v; + + if (e && tinyMCE.blockRegExp.test(e.nodeName) && e.firstChild) { + v = e.firstChild.nodeValue; + + if (v && v.length > 1 && /(^\u00a0|\u00a0$)/.test(v)) { + e.firstChild.nodeValue = v.replace(/(^\u00a0|\u00a0$)/, ''); + s.selectNode(e.firstChild, true, false, false); // Select and collapse + } + } + }, + _setUseCSS : function(b) { var d = this.getDoc(); @@ -2766,7 +2835,7 @@ TinyMCE_Control.prototype = { }, execCommand : function(command, user_interface, value) { - var doc = this.getDoc(), win = this.getWin(), focusElm = this.getFocusElement(); + var i, x, z, align, img, div, doc = this.getDoc(), win = this.getWin(), focusElm = this.getFocusElement(); // Is not a undo specific command if (!new RegExp('mceStartTyping|mceEndTyping|mceBeginUndoLevel|mceEndUndoLevel|mceAddUndoLevel', 'gi').test(command)) @@ -2789,8 +2858,8 @@ TinyMCE_Control.prototype = { // Fix align on images if (focusElm && focusElm.nodeName == "IMG") { - var align = focusElm.getAttribute('align'); - var img = command == "JustifyCenter" ? focusElm.cloneNode(false) : focusElm; + align = focusElm.getAttribute('align'); + img = command == "JustifyCenter" ? focusElm.cloneNode(false) : focusElm; switch (command) { case "JustifyLeft": @@ -2800,7 +2869,7 @@ TinyMCE_Control.prototype = { img.setAttribute('align', 'left'); // Remove the div - var div = focusElm.parentNode; + div = focusElm.parentNode; if (div && div.nodeName == "DIV" && div.childNodes.length == 1 && div.parentNode) div.parentNode.replaceChild(img, div); @@ -2813,14 +2882,14 @@ TinyMCE_Control.prototype = { img.removeAttribute('align'); // Is centered - var div = tinyMCE.getParentElement(focusElm, "div"); + div = tinyMCE.getParentElement(focusElm, "div"); if (div && div.style.textAlign == "center") { // Remove div if (div.nodeName == "DIV" && div.childNodes.length == 1 && div.parentNode) div.parentNode.replaceChild(img, div); } else { // Add div - var div = this.getDoc().createElement("div"); + div = this.getDoc().createElement("div"); div.style.textAlign = 'center'; div.appendChild(img); focusElm.parentNode.replaceChild(div, focusElm); @@ -2838,7 +2907,7 @@ TinyMCE_Control.prototype = { img.setAttribute('align', 'right'); // Remove the div - var div = focusElm.parentNode; + div = focusElm.parentNode; if (div && div.nodeName == "DIV" && div.childNodes.length == 1 && div.parentNode) div.parentNode.replaceChild(img, div); @@ -2849,7 +2918,7 @@ TinyMCE_Control.prototype = { } } - if (tinyMCE.settings['force_br_newlines']) { + if (tinyMCE.settings.force_br_newlines) { var alignValue = ""; if (doc.selection.type != "Control") { @@ -2871,7 +2940,7 @@ TinyMCE_Control.prototype = { break; } - if (alignValue != "") { + if (alignValue !== '') { var rng = doc.selection.createRange(); if ((divElm = tinyMCE.getParentElement(rng.parentElement(), "div")) != null) @@ -2925,7 +2994,7 @@ TinyMCE_Control.prototype = { break; case "FormatBlock": - if (value == null || value == "") { + if (value == null || value == '') { var elm = tinyMCE.getParentElement(this.getFocusElement(), "p,div,h1,h2,h3,h4,h5,h6,pre,address,blockquote,dt,dl,dd,samp"); if (elm) @@ -2970,7 +3039,7 @@ TinyMCE_Control.prototype = { case "mceSelectNodeDepth": var parentNode = this.getFocusElement(); - for (var i=0; parentNode; i++) { + for (i=0; parentNode; i++) { if (parentNode.nodeName.toLowerCase() == "body") break; @@ -2996,14 +3065,14 @@ TinyMCE_Control.prototype = { case "SetStyleInfo": var rng = this.getRng(); var sel = this.getSel(); - var scmd = value['command']; - var sname = value['name']; - var svalue = value['value'] == null ? '' : value['value']; + var scmd = value.command; + var sname = value.name; + var svalue = value.value == null ? '' : value.value; //var svalue = value['value'] == null ? '' : value['value']; - var wrapper = value['wrapper'] ? value['wrapper'] : "span"; + var wrapper = value.wrapper ? value.wrapper : "span"; var parentElm = null; var invalidRe = new RegExp("^BODY|HTML$", "g"); - var invalidParentsRe = tinyMCE.settings['merge_styles_invalid_parents'] != '' ? new RegExp(tinyMCE.settings['merge_styles_invalid_parents'], "gi") : null; + var invalidParentsRe = tinyMCE.settings.merge_styles_invalid_parents !== '' ? new RegExp(tinyMCE.settings.merge_styles_invalid_parents, "gi") : null; // Whole element selected check if (tinyMCE.isIE) { @@ -3022,7 +3091,7 @@ TinyMCE_Control.prototype = { } } else { var felm = this.getFocusElement(); - if (sel.isCollapsed || (new RegExp('td|tr|tbody|table', 'gi').test(felm.nodeName) && sel.anchorNode == felm.parentNode)) + if (sel.isCollapsed || (new RegExp('td|tr|tbody|table|img', 'gi').test(felm.nodeName) && sel.anchorNode == felm.parentNode)) parentElm = felm; } @@ -3040,8 +3109,8 @@ TinyMCE_Control.prototype = { } // Remove style/attribs from all children - var ch = tinyMCE.getNodeTree(parentElm, new Array(), 1); - for (var z=0; z=0; i--) { + for (i=nodes.length-1; i>=0; i--) { var elm = nodes[i]; var isNew = tinyMCE.getAttrib(elm, "mce_new") == "true"; @@ -3132,9 +3201,8 @@ TinyMCE_Control.prototype = { // Remove empty wrappers var nodes = doc.getElementsByTagName(wrapper); - for (var i=nodes.length-1; i>=0; i--) { - var elm = nodes[i]; - var isEmpty = true; + for (i=nodes.length-1; i>=0; i--) { + var elm = nodes[i], isEmpty = true; // Check if it has any attribs var tmp = doc.createElement("body"); @@ -3144,7 +3212,7 @@ TinyMCE_Control.prototype = { tmp.innerHTML = tmp.innerHTML.replace(new RegExp('style=""|class=""', 'gi'), ''); //tinyMCE.debug(tmp.innerHTML); if (new RegExp('', 'gi').test(tmp.innerHTML)) { - for (var x=0; x' + editorTemplate['html']; + deltaWidth = editorTemplate.delta_width ? editorTemplate.delta_width : 0; + deltaHeight = editorTemplate.delta_height ? editorTemplate.delta_height : 0; + html = '' + editorTemplate.html; html = tinyMCE.replaceVar(html, "editor_id", this.editorId); - this.settings['default_document'] = tinyMCE.baseURL + "/blank.htm"; - this.settings['old_width'] = this.settings['width']; - this.settings['old_height'] = this.settings['height']; + if (!this.settings.default_document) + this.settings.default_document = tinyMCE.baseURL + "/blank.htm"; + + this.settings.old_width = this.settings.width; + this.settings.old_height = this.settings.height; // Set default width, height - if (this.settings['width'] == -1) - this.settings['width'] = replace_element.offsetWidth; + if (this.settings.width == -1) + this.settings.width = replace_element.offsetWidth; - if (this.settings['height'] == -1) - this.settings['height'] = replace_element.offsetHeight; + if (this.settings.height == -1) + this.settings.height = replace_element.offsetHeight; // Try the style width - if (this.settings['width'] == 0) - this.settings['width'] = replace_element.style.width; + if (this.settings.width == 0) + this.settings.width = replace_element.style.width; // Try the style height - if (this.settings['height'] == 0) - this.settings['height'] = replace_element.style.height; + if (this.settings.height == 0) + this.settings.height = replace_element.style.height; // If no width/height then default to 320x240, better than nothing - if (this.settings['width'] == 0) - this.settings['width'] = 320; + if (this.settings.width == 0) + this.settings.width = 320; - if (this.settings['height'] == 0) - this.settings['height'] = 240; + if (this.settings.height == 0) + this.settings.height = 240; - this.settings['area_width'] = parseInt(this.settings['width']); - this.settings['area_height'] = parseInt(this.settings['height']); - this.settings['area_width'] += deltaWidth; - this.settings['area_height'] += deltaHeight; - - this.settings['width_style'] = "" + this.settings['width']; - this.settings['height_style'] = "" + this.settings['height']; + this.settings.area_width = parseInt(this.settings.width); + this.settings.area_height = parseInt(this.settings.height); + this.settings.area_width += deltaWidth; + this.settings.area_height += deltaHeight; + this.settings.width_style = "" + this.settings.width; + this.settings.height_style = "" + this.settings.height; // Special % handling - if (("" + this.settings['width']).indexOf('%') != -1) - this.settings['area_width'] = "100%"; + if (("" + this.settings.width).indexOf('%') != -1) + this.settings.area_width = "100%"; else - this.settings['width_style'] += 'px'; + this.settings.width_style += 'px'; - if (("" + this.settings['height']).indexOf('%') != -1) - this.settings['area_height'] = "100%"; + if (("" + this.settings.height).indexOf('%') != -1) + this.settings.area_height = "100%"; else - this.settings['height_style'] += 'px'; + this.settings.height_style += 'px'; if (("" + replace_element.style.width).indexOf('%') != -1) { - this.settings['width'] = replace_element.style.width; - this.settings['area_width'] = "100%"; - this.settings['width_style'] = "100%"; + this.settings.width = replace_element.style.width; + this.settings.area_width = "100%"; + this.settings.width_style = "100%"; } if (("" + replace_element.style.height).indexOf('%') != -1) { - this.settings['height'] = replace_element.style.height; - this.settings['area_height'] = "100%"; - this.settings['height_style'] = "100%"; + this.settings.height = replace_element.style.height; + this.settings.area_height = "100%"; + this.settings.height_style = "100%"; } html = tinyMCE.applyTemplate(html); - this.settings['width'] = this.settings['old_width']; - this.settings['height'] = this.settings['old_height']; + this.settings.width = this.settings.old_width; + this.settings.height = this.settings.old_height; - this.visualAid = this.settings['visual']; + this.visualAid = this.settings.visual; this.formTargetElementId = form_element_name; // Get replace_element contents @@ -3716,13 +3794,9 @@ TinyMCE_Control.prototype = { this.oldTargetElement = replace_element; // Debug mode - if (tinyMCE.settings['debug']) { - hc = ''; - } else { - hc = ''; - this.oldTargetDisplay = tinyMCE.getStyle(this.oldTargetElement, 'display', 'inline'); - this.oldTargetElement.style.display = "none"; - } + hc = ''; + this.oldTargetDisplay = tinyMCE.getStyle(this.oldTargetElement, 'display', 'inline'); + this.oldTargetElement.style.display = "none"; html += ''; @@ -3733,10 +3807,10 @@ TinyMCE_Control.prototype = { // Output HTML and set editable if (tinyMCE.isGecko) { - var rng = replace_element.ownerDocument.createRange(); + rng = replace_element.ownerDocument.createRange(); rng.setStartBefore(replace_element); - var fragment = rng.createContextualFragment(html); + fragment = rng.createContextualFragment(html); tinyMCE.insertAfter(fragment, replace_element); } else replace_element.insertAdjacentHTML("beforeBegin", html); @@ -3746,25 +3820,23 @@ TinyMCE_Control.prototype = { // Just hide the textarea element this.oldTargetElement = replace_element; - if (!tinyMCE.settings['debug']) { - this.oldTargetDisplay = tinyMCE.getStyle(this.oldTargetElement, 'display', 'inline'); - this.oldTargetElement.style.display = "none"; - } + this.oldTargetDisplay = tinyMCE.getStyle(this.oldTargetElement, 'display', 'inline'); + this.oldTargetElement.style.display = "none"; // Output HTML and set editable if (tinyMCE.isGecko) { - var rng = replace_element.ownerDocument.createRange(); + rng = replace_element.ownerDocument.createRange(); rng.setStartBefore(replace_element); - var fragment = rng.createContextualFragment(html); + fragment = rng.createContextualFragment(html); tinyMCE.insertAfter(fragment, replace_element); } else replace_element.insertAdjacentHTML("beforeBegin", html); } // Setup iframe - var dynamicIFrame = false; - var tElm = targetDoc.getElementById(this.editorId); + dynamicIFrame = false; + tElm = targetDoc.getElementById(this.editorId); if (!tinyMCE.isIE) { // Node case is preserved in XML strict mode @@ -3801,9 +3873,9 @@ TinyMCE_Control.prototype = { } // Setup base HTML - var doc = this.contentDocument; + doc = this.contentDocument; if (dynamicIFrame) { - var html = tinyMCE.getParam('doctype') + 'blank_page'; + html = tinyMCE.getParam('doctype') + 'blank_page'; try { if (!this.isHidden()) @@ -3824,7 +3896,7 @@ TinyMCE_Control.prototype = { window.setTimeout("tinyMCE.addEventHandlers(tinyMCE.instances[\"" + this.editorId + "\"]);", 1); // Setup element references - var parentElm = this.targetDoc.getElementById(this.editorId + '_parent'); + parentElm = this.targetDoc.getElementById(this.editorId + '_parent'); this.formElement = tinyMCE.isGecko ? parentElm.previousSibling : parentElm.nextSibling; tinyMCE.setupContent(this.editorId, true); @@ -3847,7 +3919,7 @@ TinyMCE_Control.prototype = { b.setAttribute('href', u); h.appendChild(b); } else { - if (u == "" || u == null) + if (u == '' || u == null) b.parentNode.removeChild(b); else b.setAttribute('href', u); @@ -3886,7 +3958,10 @@ TinyMCE_Control.prototype = { }, triggerSave : function(skip_cleanup, skip_callback) { - var e, nl = [], i, s; + var e, nl = [], i, s, content, htm; + + if (!this.enabled) + return; this.switchSettings(); s = tinyMCE.settings; @@ -3908,7 +3983,7 @@ TinyMCE_Control.prototype = { } while ((e = e.parentNode) != null) } - tinyMCE.settings['preformatted'] = false; + tinyMCE.settings.preformatted = false; // Default to false if (typeof(skip_cleanup) == "undefined") @@ -3921,17 +3996,17 @@ TinyMCE_Control.prototype = { tinyMCE._setHTML(this.getDoc(), this.getBody().innerHTML); // Remove visual aids when cleanup is disabled - if (this.settings['cleanup'] == false) { + if (this.settings.cleanup == false) { tinyMCE.handleVisualAid(this.getBody(), true, false, this); tinyMCE._setEventsEnabled(this.getBody(), true); } tinyMCE._customCleanup(this, "submit_content_dom", this.contentWindow.document.body); - var htm = skip_cleanup ? this.getBody().innerHTML : tinyMCE._cleanupHTML(this, this.getDoc(), this.settings, this.getBody(), tinyMCE.visualAid, true, true); + htm = skip_cleanup ? this.getBody().innerHTML : tinyMCE._cleanupHTML(this, this.getDoc(), this.settings, this.getBody(), tinyMCE.visualAid, true, true); htm = tinyMCE._customCleanup(this, "submit_content", htm); - if (!skip_callback && tinyMCE.settings['save_callback'] != "") - var content = eval(tinyMCE.settings['save_callback'] + "(this.formTargetElementId,htm,this.getBody());"); + if (!skip_callback && tinyMCE.settings.save_callback !== '') + content = tinyMCE.resolveDots(tinyMCE.settings.save_callback, window)(this.formTargetElementId,htm,this.getBody()); // Use callback content if available if ((typeof(content) != "undefined") && content != null) @@ -3963,444 +4038,441 @@ TinyMCE_Control.prototype = { /* file:jscripts/tiny_mce/classes/TinyMCE_Cleanup.class.js */ -TinyMCE_Engine.prototype.cleanupHTMLCode = function(s) { - s = s.replace(new RegExp('

', 'gi'), '

 

'); - s = s.replace(new RegExp('

\\s*<\\/p>', 'gi'), '

 

'); +tinyMCE.add(TinyMCE_Engine, { + cleanupHTMLCode : function(s) { + s = s.replace(new RegExp('

', 'gi'), '

 

'); + s = s.replace(new RegExp('

\\s*<\\/p>', 'gi'), '

 

'); - // Fix close BR elements - s = s.replace(new RegExp('
\\s*<\\/br>', 'gi'), '
'); + // Fix close BR elements + s = s.replace(new RegExp('
\\s*<\\/br>', 'gi'), '
'); - // Open closed tags like to - s = s.replace(new RegExp('<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\\\|>]*)\\/>', 'gi'), '<$1$2$3>'); + // Open closed tags like to + s = s.replace(new RegExp('<(h[1-6]|p|div|address|pre|form|table|li|ol|ul|td|b|font|em|strong|i|strike|u|span|a|ul|ol|li|blockquote)([a-z]*)([^\\\\|>]*)\\/>', 'gi'), '<$1$2$3>'); - // Remove trailing space to - s = s.replace(new RegExp('\\s+> to + s = s.replace(new RegExp('\\s+> to - s = s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>', 'gi'), '<$1$2 />'); + // Close tags to + s = s.replace(new RegExp('<(img|br|hr)([^>]*)><\\/(img|br|hr)>', 'gi'), '<$1$2 />'); - // Weird MSIE bug,

breaks runtime? - if (tinyMCE.isIE) - s = s.replace(new RegExp('

<\\/p>', 'gi'), "
"); - - // Weird tags will make IE error #bug: 1538495 - if (tinyMCE.isIE) - s = s.replace(//g, ''); + // Weird MSIE bug,

breaks runtime? + if (tinyMCE.isIE) + s = s.replace(new RegExp('

<\\/p>', 'gi'), "
"); - // Convert relative anchors to absolute URLs ex: #something to file.htm#something - // Removed: Since local document anchors should never be forced absolute example edit.php?id=something - //if (tinyMCE.getParam('convert_urls')) - // s = s.replace(new RegExp('(href=\"{0,1})(\\s*#)', 'gi'), '$1' + tinyMCE.settings['document_base_url'] + "#"); + // Weird tags will make IE error #bug: 1538495 + if (tinyMCE.isIE) + s = s.replace(//g, ''); - return s; -}; + // Convert relative anchors to absolute URLs ex: #something to file.htm#something + // Removed: Since local document anchors should never be forced absolute example edit.php?id=something + //if (tinyMCE.getParam('convert_urls')) + // s = s.replace(new RegExp('(href=\"{0,1})(\\s*#)', 'gi'), '$1' + tinyMCE.settings.document_base_url + "#"); -TinyMCE_Engine.prototype.parseStyle = function(str) { - var ar = new Array(); + return s; + }, - if (str == null) - return ar; + parseStyle : function(str) { + var ar = [], st, i, re, pa; - var st = str.split(';'); + if (str == null) + return ar; - tinyMCE.clearArray(ar); + st = str.split(';'); - for (var i=0; i 1) - val = "url('" + eval(tinyMCE.getParam('urlconverter_callback') + "(m[1], null, true);") + "')"; - } + if (m.length > 1) + val = "url('" + eval(tinyMCE.getParam('urlconverter_callback') + "(m[1], null, true);") + "')"; + } - // Force HEX colors - if (tinyMCE.getParam("force_hex_style_colors")) - val = tinyMCE.convertRGBToHex(val, true); + // Force HEX colors + if (tinyMCE.getParam("force_hex_style_colors")) + val = tinyMCE.convertRGBToHex(val, true); - val = val.replace(/\"/g, '\''); + val = val.replace(/\"/g, '\''); - if (val != "url('')") - str += key.toLowerCase() + ": " + val + "; "; + if (val != "url('')") + str += key.toLowerCase() + ": " + val + "; "; + } } - } - if (new RegExp('; $').test(str)) - str = str.substring(0, str.length - 2); + if (new RegExp('; $').test(str)) + str = str.substring(0, str.length - 2); - return str; -}; + return str; + }, -TinyMCE_Engine.prototype.convertRGBToHex = function(s, k) { - if (s.toLowerCase().indexOf('rgb') != -1) { - var re = new RegExp("(.*?)rgb\\s*?\\(\\s*?([0-9]+).*?,\\s*?([0-9]+).*?,\\s*?([0-9]+).*?\\)(.*?)", "gi"); - var rgb = s.replace(re, "$1,$2,$3,$4,$5").split(','); - if (rgb.length == 5) { - r = parseInt(rgb[1]).toString(16); - g = parseInt(rgb[2]).toString(16); - b = parseInt(rgb[3]).toString(16); + convertRGBToHex : function(s, k) { + var re, rgb; - r = r.length == 1 ? '0' + r : r; - g = g.length == 1 ? '0' + g : g; - b = b.length == 1 ? '0' + b : b; + if (s.toLowerCase().indexOf('rgb') != -1) { + re = new RegExp("(.*?)rgb\\s*?\\(\\s*?([0-9]+).*?,\\s*?([0-9]+).*?,\\s*?([0-9]+).*?\\)(.*?)", "gi"); + rgb = s.replace(re, "$1,$2,$3,$4,$5").split(','); - s = "#" + r + g + b; + if (rgb.length == 5) { + r = parseInt(rgb[1]).toString(16); + g = parseInt(rgb[2]).toString(16); + b = parseInt(rgb[3]).toString(16); - if (k) - s = rgb[0] + s + rgb[4]; - } - } + r = r.length == 1 ? '0' + r : r; + g = g.length == 1 ? '0' + g : g; + b = b.length == 1 ? '0' + b : b; - return s; -}; + s = "#" + r + g + b; -TinyMCE_Engine.prototype.convertHexToRGB = function(s) { - if (s.indexOf('#') != -1) { - s = s.replace(new RegExp('[^0-9A-F]', 'gi'), ''); - return "rgb(" + parseInt(s.substring(0, 2), 16) + "," + parseInt(s.substring(2, 4), 16) + "," + parseInt(s.substring(4, 6), 16) + ")"; - } + if (k) + s = rgb[0] + s + rgb[4]; + } + } - return s; -}; + return s; + }, + + convertHexToRGB : function(s) { + if (s.indexOf('#') != -1) { + s = s.replace(new RegExp('[^0-9A-F]', 'gi'), ''); + return "rgb(" + parseInt(s.substring(0, 2), 16) + "," + parseInt(s.substring(2, 4), 16) + "," + parseInt(s.substring(4, 6), 16) + ")"; + } -TinyMCE_Engine.prototype.convertSpansToFonts = function(doc) { - var sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(','); + return s; + }, - /*var h = doc.body.innerHTML; - h = h.replace(/ 0) { - tinyMCE.setAttrib(s[i], 'size', fSize); - s[i].style.fontSize = ''; - } + if (fSize > 0) { + tinyMCE.setAttrib(s[i], 'size', fSize); + s[i].style.fontSize = ''; + } - var fFace = s[i].style.fontFamily; - if (fFace != null && fFace != "") { - tinyMCE.setAttrib(s[i], 'face', fFace); - s[i].style.fontFamily = ''; - } + fFace = s[i].style.fontFamily; + if (fFace != null && fFace !== '') { + tinyMCE.setAttrib(s[i], 'face', fFace); + s[i].style.fontFamily = ''; + } - var fColor = s[i].style.color; - if (fColor != null && fColor != "") { - tinyMCE.setAttrib(s[i], 'color', tinyMCE.convertRGBToHex(fColor)); - s[i].style.color = ''; + fColor = s[i].style.color; + if (fColor != null && fColor !== '') { + tinyMCE.setAttrib(s[i], 'color', tinyMCE.convertRGBToHex(fColor)); + s[i].style.color = ''; + } } - } -}; + }, -TinyMCE_Engine.prototype.convertFontsToSpans = function(doc) { - var sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(','); + convertFontsToSpans : function(doc) { + var fsClasses, s, i, fSize, fFace, fColor, sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(','); -/* var h = doc.body.innerHTML; - h = h.replace(/ 0 && fSize < 8) { + if (fsClasses != null) + tinyMCE.setAttrib(s[i], 'class', fsClasses[fSize-1]); + else + s[i].style.fontSize = sizes[fSize-1]; + } - if (fSize != "") { - fSize = parseInt(fSize); + s[i].removeAttribute('size'); + } - if (fSize > 0 && fSize < 8) { - if (fsClasses != null) - tinyMCE.setAttrib(s[i], 'class', fsClasses[fSize-1]); - else - s[i].style.fontSize = sizes[fSize-1]; + if (fFace !== '') { + s[i].style.fontFamily = fFace; + s[i].removeAttribute('face'); } - s[i].removeAttribute('size'); + if (fColor !== '') { + s[i].style.color = fColor; + s[i].removeAttribute('color'); + } } + }, - if (fFace != "") { - s[i].style.fontFamily = fFace; - s[i].removeAttribute('face'); - } + cleanupAnchors : function(doc) { + var i, cn, x, an = doc.getElementsByTagName("a"); + + // Loops backwards due to bug #1467987 + for (i=an.length-1; i>=0; i--) { + if (tinyMCE.getAttrib(an[i], "name") !== '' && tinyMCE.getAttrib(an[i], "href") == '') { + cn = an[i].childNodes; - if (fColor != "") { - s[i].style.color = fColor; - s[i].removeAttribute('color'); + for (x=cn.length-1; x>=0; x--) + tinyMCE.insertAfter(cn[x], an[i]); + } } - } -}; + }, -TinyMCE_Engine.prototype.cleanupAnchors = function(doc) { - var i, cn, x, an = doc.getElementsByTagName("a"); + getContent : function(editor_id) { + if (typeof(editor_id) != "undefined") + tinyMCE.getInstanceById(editor_id).select(); - // Loops backwards due to bug #1467987 - for (i=an.length-1; i>=0; i--) { - if (tinyMCE.getAttrib(an[i], "name") != "" && tinyMCE.getAttrib(an[i], "href") == "") { - cn = an[i].childNodes; + if (tinyMCE.selectedInstance) + return tinyMCE.selectedInstance.getHTML(); - for (x=cn.length-1; x>=0; x--) - tinyMCE.insertAfter(cn[x], an[i]); - } - } -}; + return null; + }, -TinyMCE_Engine.prototype.getContent = function(editor_id) { - if (typeof(editor_id) != "undefined") - tinyMCE.getInstanceById(editor_id).select(); + _fixListElements : function(d) { + var nl, x, a = ['ol', 'ul'], i, n, p, r = new RegExp('^(OL|UL)$'), np; - if (tinyMCE.selectedInstance) - return tinyMCE.selectedInstance.getHTML(); + for (x=0; x]*>/gi, ''); - h = h.replace(new RegExp(' (rowspan="1"|colspan="1")', 'g'), ''); - h = h.replace(/

<\/p>/g, '
'); - h = h.replace(/

( | )<\/p>

( | )<\/p>/g, '

'); - h = h.replace(/\s*
\s*<\/td>/g, '' + nb + ''); - h = h.replace(/

\s*
\s*<\/p>/g, '

' + nb + '

'); - h = h.replace(/
$/, ''); // Remove last BR for Gecko - h = h.replace(/
<\/p>/g, '

'); // Remove last BR in P tags for Gecko - h = h.replace(/

\s*( | )\s*
\s*( | )\s*<\/p>/g, '

' + nb + '

'); - h = h.replace(/

\s*( | )\s*
\s*<\/p>/g, '

' + nb + '

'); - h = h.replace(/

\s*
\s* \s*<\/p>/g, '

' + nb + '

'); - h = h.replace(new RegExp('(.*?)<\\/a>', 'g'), '$1'); - h = h.replace(/]*)>\s*<\/p>/g, '' + nb + '

'); - - // Clean body - if (/^\s*(
|

 <\/p>|

 <\/p>|

<\/p>)\s*$/.test(h)) - h = ''; - - // If preformatted - if (s.preformatted) { - h = h.replace(/^

/, '');
-		h = h.replace(/<\/pre>$/, '');
-		h = '
' + h + '
';
-	}
+		if (tinyMCE.getParam("convert_fonts_to_spans"))
+			tinyMCE.convertFontsToSpans(doc);
 
-	// Gecko specific processing
-	if (tinyMCE.isGecko) {
-		h = h.replace(//g, '');
-		h = h.replace(/]*)>\s*
\s*<\/td>/g, '' + nb + '');
-	}
+		if (tinyMCE.getParam("fix_list_elements"))
+			tinyMCE._fixListElements(doc);
 
-	if (s.force_br_newlines)
-		h = h.replace(/
( | )<\/p>/g, '
');
+		if (tinyMCE.getParam("fix_table_elements"))
+			tinyMCE._fixTables(doc);
 
-	// Call custom cleanup code
-	h = tinyMCE._customCleanup(inst, on_save ? "get_from_editor" : "insert_to_editor", h);
+		// Call custom cleanup code
+		tinyMCE._customCleanup(inst, on_save ? "get_from_editor_dom" : "insert_to_editor_dom", doc.body);
 
-	// Remove internal classes
-	if (on_save) {
-		h = h.replace(new RegExp(' ?(mceItem[a-zA-Z0-9]*|' + s.visual_table_class + ')', 'g'), '');
-		h = h.replace(new RegExp(' ?class=""', 'g'), '');
-	}
+		if (d)
+			t2 = new Date().getTime();
 
-	if (s.remove_linebreaks && !c.settings.indent)
-		h = h.replace(/\n|\r/g, ' ');
+		c.settings.on_save = on_save;
 
-	if (d)
-		t4 = new Date().getTime();
+		c.idCount = 0;
+		c.serializationId = new Date().getTime().toString(32); // Unique ID needed for the content duplication bug
+		c.serializedNodes = [];
+		c.sourceIndex = -1;
 
-	if (on_save && c.settings.indent)
-		h = c.formatHTML(h);
+		if (s.cleanup_serializer == "xml")
+			h = c.serializeNodeAsXML(elm, inn);
+		else
+			h = c.serializeNodeAsHTML(elm, inn);
+
+		if (d)
+			t3 = new Date().getTime();
+
+		// Post processing
+		nb = tinyMCE.getParam('entity_encoding') == 'numeric' ? ' ' : ' ';
+		h = h.replace(/<\/?(body|head|html)[^>]*>/gi, '');
+		h = h.replace(new RegExp(' (rowspan="1"|colspan="1")', 'g'), '');
+		h = h.replace(/
<\/p>/g, '
');
+		h = h.replace(/
( | )<\/p>
( | )<\/p>/g, '
');
+		h = h.replace(/\s*
\s*<\/td>/g, '' + nb + '');
+		h = h.replace(/
\s*
\s*<\/p>/g, '
' + nb + '
');
+		h = h.replace(/
$/, ''); // Remove last BR for Gecko
+		h = h.replace(/
<\/p>/g, '
'); // Remove last BR in P tags for Gecko
+		h = h.replace(/
\s*( | )\s*
\s*( | )\s*<\/p>/g, '
' + nb + '
');
+		h = h.replace(/
\s*( | )\s*
\s*<\/p>/g, '
' + nb + '
');
+		h = h.replace(/
\s*
\s* \s*<\/p>/g, '
' + nb + '
');
+		h = h.replace(new RegExp('(.*?)<\\/a>', 'g'), '$1');
+		h = h.replace(/]*)>\s*<\/p>/g, '' + nb + '
');
+
+		// Clean body
+		if (/^\s*(
|
 <\/p>|
 <\/p>|
<\/p>)\s*$/.test(h))
+			h = '';
+
+		// If preformatted
+		if (s.preformatted) {
+			h = h.replace(/^
/, '');
+			h = h.replace(/<\/pre>$/, '');
+			h = '
' + h + '
';
+		}
+
+		// Gecko specific processing
+		if (tinyMCE.isGecko) {
+			// Makes no sence but FF generates it!!
+			h = h.replace(/
\s*<\/li>/g, '');
+			h = h.replace(/ \s*<\/(dd|dt)>/g, '');
+			h = h.replace(//g, '');
+			h = h.replace(/]*)>\s*
\s*<\/td>/g, '' + nb + '');
+		}
 
-	// If encoding (not recommended option)
-	if (on_submit && (s.encoding == "xml" || s.encoding == "html"))
-		h = c.xmlEncode(h);
+		if (s.force_br_newlines)
+			h = h.replace(/
( | )<\/p>/g, '
');
 
-	if (d)
-		t5 = new Date().getTime();
+		// Call custom cleanup code
+		h = tinyMCE._customCleanup(inst, on_save ? "get_from_editor" : "insert_to_editor", h);
 
-	if (c.settings.debug)
-		tinyMCE.debug("Cleanup in ms: Pre=" + (t2-t1) + ", Serialize: " + (t3-t2) + ", Post: " + (t4-t3) + ", Format: " + (t5-t4) + ", Sum: " + (t5-t1) + ".");
+		// Remove internal classes
+		if (on_save) {
+			h = h.replace(new RegExp(' ?(mceItem[a-zA-Z0-9]*|' + s.visual_table_class + ')', 'g'), '');
+			h = h.replace(new RegExp(' ?class=""', 'g'), '');
+		}
 
-	return h;
-};
+		if (s.remove_linebreaks && !c.settings.indent)
+			h = h.replace(/\n|\r/g, ' ');
+
+		if (d)
+			t4 = new Date().getTime();
+
+		if (on_save && c.settings.indent)
+			h = c.formatHTML(h);
+
+		// If encoding (not recommended option)
+		if (on_submit && (s.encoding == "xml" || s.encoding == "html"))
+			h = c.xmlEncode(h);
+
+		if (d)
+			t5 = new Date().getTime();
+
+		if (c.settings.debug)
+			tinyMCE.debug("Cleanup in ms: Pre=" + (t2-t1) + ", Serialize: " + (t3-t2) + ", Post: " + (t4-t3) + ", Format: " + (t5-t4) + ", Sum: " + (t5-t1) + ".");
+
+		return h;
+	}
+});
 
 function TinyMCE_Cleanup() {
 	this.isIE = (navigator.appName == "Microsoft Internet Explorer");
-	this.rules = tinyMCE.clearArray(new Array());
+	this.rules = tinyMCE.clearArray([]);
 
 	// Default config
 	this.settings = {
@@ -4418,7 +4490,7 @@ function TinyMCE_Cleanup() {
 		verify_html : false
 	};
 
-	this.vElements = tinyMCE.clearArray(new Array());
+	this.vElements = tinyMCE.clearArray([]);
 	this.vElementsRe = '';
 	this.closeElementsRe = /^(IMG|BR|HR|LINK|META|BASE|INPUT|AREA)$/;
 	this.codeElementsRe = /^(SCRIPT|STYLE)$/;
@@ -4448,7 +4520,7 @@ TinyMCE_Cleanup.prototype = {
 		this.nlBeforeAfterRe = this._arrayToRe(s.newline_before_after_elements.split(','), 'gi', '<(\\/?)(', ')([^>]*)>');
 		this.serializedNodes = [];
 
-		if (s.invalid_elements != '')
+		if (s.invalid_elements !== '')
 			this.iveRe = this._arrayToRe(s.invalid_elements.toUpperCase().split(','), 'g', '^(', ')$');
 		else
 			this.iveRe = null;
@@ -4469,19 +4541,17 @@ TinyMCE_Cleanup.prototype = {
 		this.fillStr = s.entity_encoding == "named" ? " " : " ";
 		this.idCount = 0;
 		this.xmlEncodeRe = new RegExp('[\u007F-\uFFFF<>&"]', 'g');
-		this.xmlEncodeAposRe = new RegExp('[\u007F-\uFFFF<>&"\']', 'g');
 	},
 
 	addRuleStr : function(s) {
-		var r = this.parseRuleStr(s);
-		var n;
+		var r = this.parseRuleStr(s), n;
 
 		for (n in r) {
 			if (r[n])
 				this.rules[n] = r[n];
 		}
 
-		this.vElements = tinyMCE.clearArray(new Array());
+		this.vElements = tinyMCE.clearArray([]);
 
 		for (n in this.rules) {
 			if (this.rules[n])
@@ -4492,7 +4562,8 @@ TinyMCE_Cleanup.prototype = {
 	},
 
 	isValid : function(n) {
-		this._setupRules(); // Will initialize cleanup rules
+		if (!this.rulesDone)
+			this._setupRules(); // Will initialize cleanup rules
 
 		// Empty is true since it removes formatting
 		if (!n)
@@ -4548,9 +4619,9 @@ TinyMCE_Cleanup.prototype = {
 				}
 
 				r += ')$';
-//tinyMCE.debug(t + "=" + r);
+
 				if (this.childRules == null)
-					this.childRules = tinyMCE.clearArray(new Array());
+					this.childRules = tinyMCE.clearArray([]);
 
 				this.childRules[tn[y]] = new RegExp(r);
 
@@ -4561,7 +4632,7 @@ TinyMCE_Cleanup.prototype = {
 	},
 
 	parseRuleStr : function(s) {
-		var ta, p, r, a, i, x, px, t, tn, y, av, or = tinyMCE.clearArray(new Array()), dv;
+		var ta, p, r, a, i, x, px, t, tn, y, av, or = tinyMCE.clearArray([]), dv;
 
 		if (s == null || s.length == 0)
 			return or;
@@ -4621,19 +4692,19 @@ TinyMCE_Cleanup.prototype = {
 						if (av && av.length > 0) {
 							if (av[0].charAt(0) == ':') {
 								if (!r.forceAttribs)
-									r.forceAttribs = tinyMCE.clearArray(new Array());
+									r.forceAttribs = tinyMCE.clearArray([]);
 
 								r.forceAttribs[t.toLowerCase()] = av[0].substring(1);
 							} else if (av[0].charAt(0) == '=') {
 								if (!r.defaultAttribs)
-									r.defaultAttribs = tinyMCE.clearArray(new Array());
+									r.defaultAttribs = tinyMCE.clearArray([]);
 
 								dv = av[0].substring(1);
 
-								r.defaultAttribs[t.toLowerCase()] = dv == "" ? "mce_empty" : dv;
+								r.defaultAttribs[t.toLowerCase()] = dv == '' ? "mce_empty" : dv;
 							} else if (av[0].charAt(0) == '<') {
 								if (!r.validAttribValues)
-									r.validAttribValues = tinyMCE.clearArray(new Array());
+									r.validAttribValues = tinyMCE.clearArray([]);
 
 								r.validAttribValues[t.toLowerCase()] = this._arrayToRe(this.split('?', av[0].substring(1)), 'i');
 							}
@@ -4656,7 +4727,7 @@ TinyMCE_Cleanup.prototype = {
 					//tinyMCE.debug(r.tag, r.oTagName, r.vAttribsRe, r.vAttribsReWC);
 				} else {
 					r.vAttribsRe = '';
-					r.vAttribs = tinyMCE.clearArray(new Array());
+					r.vAttribs = tinyMCE.clearArray([]);
 					r.vAttribsReIsWild = false;
 				}
 
@@ -4745,7 +4816,8 @@ TinyMCE_Cleanup.prototype = {
 	serializeNodeAsHTML : function(n, inn) {
 		var en, no, h = '', i, l, t, st, r, cn, va = false, f = false, at, hc, cr, nn;
 
-		this._setupRules(); // Will initialize cleanup rules
+		if (!this.rulesDone)
+			this._setupRules(); // Will initialize cleanup rules
 
 		if (tinyMCE.isRealIE && this._isDuplicate(n))
 			return '';
@@ -4767,12 +4839,19 @@ TinyMCE_Cleanup.prototype = {
 				if (st)
 					break;
 
-				// MSIE sometimes produces 
-				if ((tinyMCE.isRealIE) && n.nodeName.indexOf('/') != -1)
-					break;
-
 				nn = n.nodeName;
 
+				if (tinyMCE.isRealIE) {
+					// MSIE sometimes produces 
+					if (n.nodeName.indexOf('/') != -1)
+						break;
+
+					// MSIE has it's NS in a separate attrib
+					if (n.scopeName && n.scopeName != 'HTML')
+						nn = n.scopeName.toUpperCase() + ':' + nn.toUpperCase();
+				} else if (tinyMCE.isOpera && nn.indexOf(':') > 0)
+					nn = nn.toUpperCase();
+
 				// Convert fonts to spans
 				if (this.settings.convert_fonts_to_spans) {
 					// On get content FONT -> SPAN
@@ -4959,25 +5038,26 @@ TinyMCE_Cleanup.prototype = {
 		return o;
 	},
 
-	xmlEncode : function(s, skip_apos) {
-		var cl = this, re = !skip_apos ? this.xmlEncodeAposRe : this.xmlEncodeRe;
+	xmlEncode : function(s) {
+		var cl = this, re = this.xmlEncodeRe;
 
-		this._setupEntities(); // Will intialize lookup table
+		if (!this.entitiesDone)
+			this._setupEntities(); // Will intialize lookup table
 
 		switch (this.settings.entity_encoding) {
 			case "raw":
-				return tinyMCE.xmlEncode(s, skip_apos);
+				return tinyMCE.xmlEncode(s);
 
 			case "named":
-				return s.replace(re, function (c, b) {
-					b = cl.entities[c.charCodeAt(0)];
+				return s.replace(re, function (c) {
+					var b = cl.entities[c.charCodeAt(0)];
 
 					return b ? '&' + b + ';' : c;
 				});
 
 			case "numeric":
-				return s.replace(re, function (c, b) {
-					return b ? '&#' + c.charCodeAt(0) + ';' : c;
+				return s.replace(re, function (c) {
+					return '&#' + c.charCodeAt(0) + ';';
 				});
 		}
 
@@ -4985,11 +5065,10 @@ TinyMCE_Cleanup.prototype = {
 	},
 
 	split : function(re, s) {
-		var c = s.split(re);
-		var i, l, o = new Array();
+		var i, l, o = [], c = s.split(re);
 
 		for (i=0, l=c.length; i' : '>' + h + '';
+		o += !h ? ' />' : '>' + h + '';
 
-	return o;
-};
+		return o;
+	},
 
-TinyMCE_Engine.prototype.createTag = function(d, tn, a, h) {
-	var o = d.createElement(tn);
+	createTag : function(d, tn, a, h) {
+		var o = d.createElement(tn), n;
 
-	if (a) {
-		for (n in a) {
-			if (typeof(a[n]) != 'function' && a[n] != null)
-				tinyMCE.setAttrib(o, n, a[n]);
+		if (a) {
+			for (n in a) {
+				if (typeof(a[n]) != 'function' && a[n] != null)
+					tinyMCE.setAttrib(o, n, a[n]);
+			}
 		}
-	}
-
-	if (h)
-		o.innerHTML = h;
 
-	return o;
-};
+		if (h)
+			o.innerHTML = h;
 
-TinyMCE_Engine.prototype.getElementByAttributeValue = function(n, e, a, v) {
-	return (n = this.getElementsByAttributeValue(n, e, a, v)).length == 0 ? null : n[0];
-};
+		return o;
+	},
 
-TinyMCE_Engine.prototype.getElementsByAttributeValue = function(n, e, a, v) {
-	var i, nl = n.getElementsByTagName(e), o = new Array();
+	getElementByAttributeValue : function(n, e, a, v) {
+		return (n = this.getElementsByAttributeValue(n, e, a, v)).length == 0 ? null : n[0];
+	},
 
-	for (i=0; i]*)>/gi, '');
-		h = h.replace(/]*)>/gi, '');
-		h = h.replace(/]*)>/gi, '');
-		h = h.replace(/]*)>/gi, '');
-		h = h.replace(/<\/strong>/gi, '');
-		h = h.replace(/<\/em>/gi, '');
-	}
+	insertAfter : function(n, r){
+		if (r.nextSibling)
+			r.parentNode.insertBefore(n, r.nextSibling);
+		else
+			r.parentNode.appendChild(n);
+	},
 
-	if (tinyMCE.isRealIE) {
-		// Since MSIE handles invalid HTML better that valid XHTML we
-		// need to make some things invalid. 
 gets converted to 
.
-		h = h.replace(/\s\/>/g, '>');
+	setInnerHTML : function(e, h) {
+		var i, nl, n;
 
-		// Since MSIE auto generated emtpy P tags some times we must tell it to keep the real ones
-		h = h.replace(/]*)>\u00A0?<\/p>/gi, ' 
'); // Keep empty paragraphs
-		h = h.replace(/]*)>\s* \s*<\/p>/gi, ' 
'); // Keep empty paragraphs
-		h = h.replace(/]*)>\s+<\/p>/gi, ' 
'); // Keep empty paragraphs
+		// Convert all strong/em to b/i in Gecko
+		if (tinyMCE.isGecko) {
+			h = h.replace(/]*)>/gi, '');
+			h = h.replace(/]*)>/gi, '');
+			h = h.replace(/]*)>/gi, '');
+			h = h.replace(/]*)>/gi, '');
+			h = h.replace(/<\/strong>/gi, '');
+			h = h.replace(/<\/em>/gi, '');
+		}
 
-		// Remove first comment
-		e.innerHTML = tinyMCE.uniqueTag + h;
-		e.firstChild.removeNode(true);
+		if (tinyMCE.isRealIE) {
+			// Since MSIE handles invalid HTML better that valid XHTML we
+			// need to make some things invalid. 
 gets converted to 
.
+			h = h.replace(/\s\/>/g, '>');
+
+			// Since MSIE auto generated emtpy P tags some times we must tell it to keep the real ones
+			h = h.replace(/]*)>\u00A0?<\/p>/gi, ' 
'); // Keep empty paragraphs
+			h = h.replace(/]*)>\s* \s*<\/p>/gi, ' 
'); // Keep empty paragraphs
+			h = h.replace(/]*)>\s+<\/p>/gi, ' 
'); // Keep empty paragraphs
+
+			// Remove first comment
+			e.innerHTML = tinyMCE.uniqueTag + h;
+			e.firstChild.removeNode(true);
+
+			// Remove weird auto generated empty paragraphs unless it's supposed to be there
+			nl = e.getElementsByTagName("p");
+			for (i=nl.length-1; i>=0; i--) {
+				n = nl[i];
+
+				if (n.nodeName == 'P' && !n.hasChildNodes() && !n.mce_keep)
+					n.parentNode.removeChild(n);
+			}
+		} else {
+			h = this.fixGeckoBaseHREFBug(1, e, h);
+			e.innerHTML = h;
+			this.fixGeckoBaseHREFBug(2, e, h);
+		}
+	},
 
-		// Remove weird auto generated empty paragraphs unless it's supposed to be there
-		nl = e.getElementsByTagName("p");
-		for (i=nl.length-1; i>=0; i--) {
-			n = nl[i];
+	getOuterHTML : function(e) {
+		var d;
 
-			if (n.nodeName == 'P' && !n.hasChildNodes() && !n.mce_keep)
-				n.parentNode.removeChild(n);
-		}
-	} else {
-		h = this.fixGeckoBaseHREFBug(1, e, h);
-		e.innerHTML = h;
-		this.fixGeckoBaseHREFBug(2, e, h);
-	}
-};
+		if (tinyMCE.isIE)
+			return e.outerHTML;
 
-TinyMCE_Engine.prototype.getOuterHTML = function(e) {
-	if (tinyMCE.isIE)
-		return e.outerHTML;
+		d = e.ownerDocument.createElement("body");
+		d.appendChild(e.cloneNode(true));
 
-	var d = e.ownerDocument.createElement("body");
-	d.appendChild(e.cloneNode(true));
-	return d.innerHTML;
-};
+		return d.innerHTML;
+	},
 
-TinyMCE_Engine.prototype.setOuterHTML = function(e, h, d) {
-	var d = typeof(d) == "undefined" ? e.ownerDocument : d, i, nl, t;
+	setOuterHTML : function(e, h, d) {
+		var d = typeof(d) == "undefined" ? e.ownerDocument : d, i, nl, t;
 
-	if (tinyMCE.isIE && e.nodeType == 1)
-		e.outerHTML = h;
-	else {
-		t = d.createElement("body");
-		t.innerHTML = h;
+		if (tinyMCE.isIE && e.nodeType == 1)
+			e.outerHTML = h;
+		else {
+			t = d.createElement("body");
+			t.innerHTML = h;
 
-		for (i=0, nl=t.childNodes; i-1; i--) {
-			if (ar[i].specified && ar[i].nodeValue)
-				ne.setAttribute(ar[i].nodeName.toLowerCase(), ar[i].nodeValue);
-		}
+			ar = e.attributes;
+			for (i=ar.length-1; i>-1; i--) {
+				if (ar[i].specified && ar[i].nodeValue)
+					ne.setAttribute(ar[i].nodeName.toLowerCase(), ar[i].nodeValue);
+			}
 
-		ar = e.childNodes;
-		for (i=0; i= strTok2.length) {
-		for (var i=0; i= strTok2.length || strTok1[i] != strTok2[i]) {
-				breakPoint = i + 1;
-				break;
+		if (targetURL.path == '')
+			targetURL.path = "/";
+		else
+			forceSlash = true;
+
+		// Crop away last path part
+		base_url = baseURL.path.substring(0, baseURL.path.lastIndexOf('/'));
+		strTok1 = base_url.split('/');
+		strTok2 = targetURL.path.split('/');
+
+		if (strTok1.length >= strTok2.length) {
+			for (i=0; i= strTok2.length || strTok1[i] != strTok2[i]) {
+					breakPoint = i + 1;
+					break;
+				}
 			}
 		}
-	}
 
-	if (strTok1.length < strTok2.length) {
-		for (var i=0; i= strTok1.length || strTok1[i] != strTok2[i]) {
-				breakPoint = i + 1;
-				break;
+		if (strTok1.length < strTok2.length) {
+			for (i=0; i= strTok1.length || strTok1[i] != strTok2[i]) {
+					breakPoint = i + 1;
+					break;
+				}
 			}
 		}
-	}
 
-	if (breakPoint == 1)
-		return targetURL.path;
+		if (breakPoint == 1)
+			return targetURL.path;
 
-	for (var i=0; i<(strTok1.length-(breakPoint-1)); i++)
-		outPath += "../";
+		for (i=0; i<(strTok1.length-(breakPoint-1)); i++)
+			outPath += "../";
 
-	for (var i=breakPoint-1; i=0; i--) {
-		if (baseURLParts[i].length == 0)
-			continue;
+		// Remove empty chunks
+		newBaseURLParts = [];
+		for (i=baseURLParts.length-1; i>=0; i--) {
+			if (baseURLParts[i].length == 0)
+				continue;
 
-		newBaseURLParts[newBaseURLParts.length] = baseURLParts[i];
-	}
-	baseURLParts = newBaseURLParts.reverse();
+			newBaseURLParts[newBaseURLParts.length] = baseURLParts[i];
+		}
+		baseURLParts = newBaseURLParts.reverse();
 
-	// Merge relURLParts chunks
-	var newRelURLParts = new Array();
-	var numBack = 0;
-	for (var i=relURLParts.length-1; i>=0; i--) {
-		if (relURLParts[i].length == 0 || relURLParts[i] == ".")
-			continue;
+		// Merge relURLParts chunks
+		newRelURLParts = [];
+		numBack = 0;
+		for (i=relURLParts.length-1; i>=0; i--) {
+			if (relURLParts[i].length == 0 || relURLParts[i] == ".")
+				continue;
 
-		if (relURLParts[i] == '..') {
-			numBack++;
-			continue;
-		}
+			if (relURLParts[i] == '..') {
+				numBack++;
+				continue;
+			}
 
-		if (numBack > 0) {
-			numBack--;
-			continue;
-		}
+			if (numBack > 0) {
+				numBack--;
+				continue;
+			}
 
-		newRelURLParts[newRelURLParts.length] = relURLParts[i];
-	}
+			newRelURLParts[newRelURLParts.length] = relURLParts[i];
+		}
 
-	relURLParts = newRelURLParts.reverse();
+		relURLParts = newRelURLParts.reverse();
 
-	// Remove end from absolute path
-	var len = baseURLParts.length-numBack;
-	var absPath = (len <= 0 ? "" : "/") + baseURLParts.slice(0, len).join('/') + "/" + relURLParts.join('/');
-	var start = "", end = "";
+		// Remove end from absolute path
+		len = baseURLParts.length-numBack;
+		absPath = (len <= 0 ? "" : "/") + baseURLParts.slice(0, len).join('/') + "/" + relURLParts.join('/');
+		start = "";
+		end = "";
 
-	// Build output URL
-	relURL.protocol = baseURL.protocol;
-	relURL.host = baseURL.host;
-	relURL.port = baseURL.port;
+		// Build output URL
+		relURL.protocol = baseURL.protocol;
+		relURL.host = baseURL.host;
+		relURL.port = baseURL.port;
 
-	// Re-add trailing slash if it's removed
-	if (relURL.path.charAt(relURL.path.length-1) == "/")
-		absPath += "/";
+		// Re-add trailing slash if it's removed
+		if (relURL.path.charAt(relURL.path.length-1) == "/")
+			absPath += "/";
 
-	relURL.path = absPath;
+		relURL.path = absPath;
 
-	return this.serializeURL(relURL);
-};
+		return this.serializeURL(relURL);
+	},
 
-TinyMCE_Engine.prototype.convertURL = function(url, node, on_save) {
-	var prot = document.location.protocol;
-	var host = document.location.hostname;
-	var port = document.location.port;
+	convertURL : function(url, node, on_save) {
+		var dl = document.location, start, portPart, urlParts, baseUrlParts, tmpUrlParts, curl;
+		var prot = dl.protocol, host = dl.hostname, port = dl.port;
 
-	// Pass through file protocol
-	if (prot == "file:")
-		return url;
+		// Pass through file protocol
+		if (prot == "file:")
+			return url;
 
-	// Something is wrong, remove weirdness
-	url = tinyMCE.regexpReplace(url, '(http|https):///', '/');
+		// Something is wrong, remove weirdness
+		url = tinyMCE.regexpReplace(url, '(http|https):///', '/');
 
-	// Mailto link or anchor (Pass through)
-	if (url.indexOf('mailto:') != -1 || url.indexOf('javascript:') != -1 || tinyMCE.regexpReplace(url,'[ \t\r\n\+]|%20','').charAt(0) == "#")
-		return url;
+		// Mailto link or anchor (Pass through)
+		if (url.indexOf('mailto:') != -1 || url.indexOf('javascript:') != -1 || /^[ \t\r\n\+]*[#\?]/.test(url))
+			return url;
 
-	// Fix relative/Mozilla
-	if (!tinyMCE.isIE && !on_save && url.indexOf("://") == -1 && url.charAt(0) != '/')
-		return tinyMCE.settings['base_href'] + url;
+		// Fix relative/Mozilla
+		if (!tinyMCE.isIE && !on_save && url.indexOf("://") == -1 && url.charAt(0) != '/')
+			return tinyMCE.settings.base_href + url;
 
-	// Handle relative URLs
-	if (on_save && tinyMCE.getParam('relative_urls')) {
-		var curl = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], url);
-		if (curl.charAt(0) == '/')
-			curl = tinyMCE.settings['document_base_prefix'] + curl;
+		// Handle relative URLs
+		if (on_save && tinyMCE.getParam('relative_urls')) {
+			curl = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href, url);
+			if (curl.charAt(0) == '/')
+				curl = tinyMCE.settings.document_base_prefix + curl;
 
-		var urlParts = tinyMCE.parseURL(curl);
-		var tmpUrlParts = tinyMCE.parseURL(tinyMCE.settings['document_base_url']);
+			urlParts = tinyMCE.parseURL(curl);
+			tmpUrlParts = tinyMCE.parseURL(tinyMCE.settings.document_base_url);
 
-		// Force relative
-		if (urlParts['host'] == tmpUrlParts['host'] && (urlParts['port'] == tmpUrlParts['port']))
-			return tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings['document_base_url'], curl);
-	}
+			// Force relative
+			if (urlParts.host == tmpUrlParts.host && (urlParts.port == tmpUrlParts.port))
+				return tinyMCE.convertAbsoluteURLToRelativeURL(tinyMCE.settings.document_base_url, curl);
+		}
 
-	// Handle absolute URLs
-	if (!tinyMCE.getParam('relative_urls')) {
-		var urlParts = tinyMCE.parseURL(url);
-		var baseUrlParts = tinyMCE.parseURL(tinyMCE.settings['base_href']);
+		// Handle absolute URLs
+		if (!tinyMCE.getParam('relative_urls')) {
+			urlParts = tinyMCE.parseURL(url);
+			baseUrlParts = tinyMCE.parseURL(tinyMCE.settings.base_href);
 
-		// Force absolute URLs from relative URLs
-		url = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], url);
+			// Force absolute URLs from relative URLs
+			url = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href, url);
 
-		// If anchor and path is the same page
-		if (urlParts['anchor'] && urlParts['path'] == baseUrlParts['path'])
-			return "#" + urlParts['anchor'];
-	}
+			// If anchor and path is the same page
+			if (urlParts.anchor && urlParts.path == baseUrlParts.path)
+				return "#" + urlParts.anchor;
+		}
 
-	// Remove current domain
-	if (tinyMCE.getParam('remove_script_host')) {
-		var start = "", portPart = "";
+		// Remove current domain
+		if (tinyMCE.getParam('remove_script_host')) {
+			start = "";
+			portPart = "";
 
-		if (port != "")
-			portPart = ":" + port;
+			if (port !== '')
+				portPart = ":" + port;
 
-		start = prot + "//" + host + portPart + "/";
+			start = prot + "//" + host + portPart + "/";
 
-		if (url.indexOf(start) == 0)
-			url = url.substring(start.length-1);
-	}
+			if (url.indexOf(start) == 0)
+				url = url.substring(start.length-1);
+		}
 
-	return url;
-};
+		return url;
+	},
 
-TinyMCE_Engine.prototype.convertAllRelativeURLs = function(body) {
-	var i, elms, src, href, mhref, msrc;
+	convertAllRelativeURLs : function(body) {
+		var i, elms, src, href, mhref, msrc;
 
-	// Convert all image URL:s to absolute URL
-	elms = body.getElementsByTagName("img");
-	for (i=0; i 0)
 					rng.selectNodeContents(nodes[0]);
 				else
@@ -6706,7 +6799,7 @@ TinyMCE_Selection.prototype = {
 
 function TinyMCE_UndoRedo(inst) {
 	this.instance = inst;
-	this.undoLevels = new Array();
+	this.undoLevels = [];
 	this.undoIndex = 0;
 	this.typingUndoIndex = -1;
 	this.undoRedo = true;
@@ -6732,10 +6825,13 @@ TinyMCE_UndoRedo.prototype = {
 		if (this.undoLevels[this.undoIndex] && newHTML != this.undoLevels[this.undoIndex].content) {
 			//tinyMCE.debug(newHTML, this.undoLevels[this.undoIndex].content);
 
+			// Is dirty again
+			inst.isNotDirty = false;
+
 			tinyMCE.dispatchCallback(inst, 'onchange_callback', 'onChange', inst);
 
 			// Time to compress
-			customUndoLevels = tinyMCE.settings['custom_undo_redo_levels'];
+			customUndoLevels = tinyMCE.settings.custom_undo_redo_levels;
 			if (customUndoLevels != -1 && this.undoLevels.length > customUndoLevels) {
 				for (i=0; i 1 ? ',' : '') + 'a[' + i + ']';
-
-		o = s._fu;
-		s._fu = this;
-		r = eval('s._fu(' + as + ')');
-		s._fu = o;
-
-		return r;
-	};
-};
-
 /* file:jscripts/tiny_mce/classes/TinyMCE_Debug.class.js */
 
-TinyMCE_Engine.prototype.debug = function() {
-	var m = "", a, i, l = tinyMCE.log.length;
+tinyMCE.add(TinyMCE_Engine, {
+	debug : function() {
+		var m = "", a, i, l = tinyMCE.log.length;
+
+		for (i=0, a = this.debug.arguments; i