X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-debug.js;h=ababcede6be145304c57d0636b9d1fce26cc67fd;hb=5ea3eb7fac2a9e23fce3451ad6e978400b737f9c;hp=beb4a3559f399a3f85ba59c789e6f5fcfc0b8398;hpb=eba01c66153e854d0fa947f82e3b2402f6683feb;p=roojs1 diff --git a/roojs-debug.js b/roojs-debug.js index beb4a3559f..ababcede6b 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -43953,15 +43953,9 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { var remove_keep_children= Roo.HtmlEditorCore.remove.indexOf(node.tagName.toLowerCase()) > -1; - - if (!node.attributes || !node.attributes.length) { - - if (lcname == 'span' && - node.childNodes.length == 1 && - node.childNodes[0].nodeName.toLowerCase() == 'span' - ) { - remove_keep_children = true; - } + // spans with no attributes - just remove them.. + if ((!node.attributes || !node.attributes.length) && lcname == 'span') { + remove_keep_children = true; } // remove as rendering on yahoo mailer is borked with this. @@ -44084,11 +44078,11 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { if (a.name == 'class') { if (a.value.match(/^Mso/)) { - node.className = ''; + node.removeAttribute('class'); } if (a.value.match(/^body$/)) { - node.className = ''; + node.removeAttribute('class'); } continue; } @@ -45697,7 +45691,7 @@ Roo.apply(Roo.form.HtmlEditor.ToolbarStandard.prototype, { var c = Roo.get(editorcore.doc.body); c.select('[class]').each(function(s) { - s.dom.className = ''; + s.dom.removeAttribute('class'); }); editorcore.syncValue(); },