From 1d303b6e940a8fc9d814366ec2daa7ee804ab431 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 21 Dec 2015 15:58:42 +0800 Subject: [PATCH] Roo/HtmlEditorCore.js --- Roo/HtmlEditorCore.js | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/Roo/HtmlEditorCore.js b/Roo/HtmlEditorCore.js index b7e33bd66f..22e3664ea8 100644 --- a/Roo/HtmlEditorCore.js +++ b/Roo/HtmlEditorCore.js @@ -1272,44 +1272,16 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { return; } - if (node.tagName.toLowerCase().match(/^(style|script|applet|embed|noframes|noscript)$/)) { - node.parentNode.removeChild(node); + if (!node.tagName.toLowerCase().match(/^(table|td|tr)$/)) { return; } - - // remove - but keep children.. - if (node.tagName.toLowerCase().match(/^(meta|link|\\?xml:|st1:|o:|font)/)) { - while (node.childNodes.length) { - var cn = node.childNodes[0]; - node.removeChild(cn); - node.parentNode.insertBefore(cn, node); - } - node.parentNode.removeChild(node); - cleanWordChildren(); - return; - } - // clean styles - if (node.className.length) { - - var cn = node.className.split(/\W+/); - var cna = []; - Roo.each(cn, function(cls) { - if (cls.match(/Mso[a-zA-Z]+/)) { - return; - } - cna.push(cls); - }); - node.className = cna.length ? cna.join(' ') : ''; - if (!cna.length) { - node.removeAttribute("class"); - } - } - - if (node.hasAttribute("lang")) { - node.removeAttribute("lang"); + if (node.hasAttribute('width')) { + node.removeAttribute('width'); } + if (node.hasAttribute("style")) { + // pretty basic... var styles = node.getAttribute("style").split(";"); var nstyle = []; @@ -1318,7 +1290,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { return; } var kv = s.split(":"); - if (kv[0].match(/^(mso-|line|font|background|margin|padding|color)/)) { + if (kv[0].match(/^(width)/)) { return; } // what ever is left... we allow. -- 2.39.2