X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=771599aab30ce9c8ed648768efee7d24b32cd3e9;hb=5ea3eb7fac2a9e23fce3451ad6e978400b737f9c;hp=6aadce840d2e8be5790db854cb24c26b3107990c;hpb=eba01c66153e854d0fa947f82e3b2402f6683feb;p=roojs1

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 6aadce840d..771599aab3 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -23025,15 +23025,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 <a name=....> as rendering on yahoo mailer is borked with this.
@@ -23156,11 +23150,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;
             }