roojs-ui.js

roojs-ui-debug.js
roojs-bootstrap.js
roojs-bootstrap-debug.js
roojs-all.js
roojs-debug.js

diff --git a/roojs-all.js b/roojs-all.js
index e09dea5..bdac03d 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1813,7 +1813,7 @@ return;}var F=v.split(/;/);var G=[];Roo.each(F,function(p){p=p.replace(/^\s+/g,'
 }if(D.length&&D.indexOf(l)<0){return true;}G.push(p);return true;});if(G.length){A.setAttribute(n,G.join(';'));}else{A.removeAttribute(n);}}for(var i=A.attributes.length-1;i>-1;i--){var a=A.attributes[i];if(a.name.toLowerCase().substr(0,2)=='on'){A.removeAttribute(a.name);
 continue;}if(Roo.HtmlEditorCore.ablack.indexOf(a.name.toLowerCase())>-1){A.removeAttribute(a.name);continue;}if(Roo.HtmlEditorCore.aclean.indexOf(a.name.toLowerCase())>-1){cleanAttr(a.name,a.value);continue;}if(a.name=='style'){cleanStyle(a.name,a.value);
 continue;}if(a.name=='class'){if(a.value.match(/^Mso/)){A.className='';}if(a.value.match(/^body$/)){A.className='';}continue;}}this.cleanUpChildren(A);},cleanWord:function(A){if(!A){this.cleanWord(this.doc.body);return;}if(A.nodeName=='SPAN'){console.log(A);
-console.log(A.attributes);console.log(A.classList);console.log(A.childNodes);console.log(A.childNodes[0].nodeName);}if(A.nodeName=="#text"){return;}if(A.nodeName=="#comment"){A.parentNode.removeChild(A);return;}if(A.tagName.toLowerCase().match(/^(style|script|applet|embed|noframes|noscript)$/)){A.parentNode.removeChild(A);
+console.log(A.hasAttributes());console.log(A.childNodes.length);console.log(A.firstChild.nodeName);}if(A.nodeName=="#text"){return;}if(A.nodeName=="#comment"){A.parentNode.removeChild(A);return;}if(A.tagName.toLowerCase().match(/^(style|script|applet|embed|noframes|noscript)$/)){A.parentNode.removeChild(A);
 return;}if(A.tagName.toLowerCase().match(/^(meta|link|\\?xml:|st1:|o:|font)/)){while(A.childNodes.length){var cn=A.childNodes[0];A.removeChild(cn);A.parentNode.insertBefore(cn,A);}A.parentNode.removeChild(A);this.iterateChildren(A,this.cleanWord);return;}
 if(A.className.length){var cn=A.className.split(/\W+/);var B=[];Roo.each(cn,function(E){if(E.match(/Mso[a-zA-Z]+/)){return;}B.push(E);});A.className=B.length?B.join(' '):'';if(!B.length){A.removeAttribute("class");}}if(A.hasAttribute("lang")){A.removeAttribute("lang");
 }if(A.hasAttribute("style")){var C=A.getAttribute("style").split(";");var D=[];Roo.each(C,function(s){if(!s.match(/:/)){return;}var kv=s.split(":");if(kv[0].match(/^(mso-|line|font|background|margin|padding|color)/)){return;}D.push(s);});A.setAttribute("style",D.length?D.join(';'):'');

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 45eccd5..7ddf5ee 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -23154,12 +23154,16 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
             return;
         }
         
-        if(node.nodeName == 'SPAN') {
+        if(
+                node.nodeName == 'SPAN'
+//                !node.hasAttributes() &&
+//                node.childNodes.length == 1 &&
+//                node.firstChild.nodeName == "#text"
+        ) {
             console.log(node);
-            console.log(node.attributes);
-            console.log(node.classList);
-            console.log(node.childNodes);
-            console.log(node.childNodes[0].nodeName);
+            console.log(node.hasAttributes());
+            console.log(node.childNodes.length);
+            console.log(node.firstChild.nodeName);
         }
         
         if (node.nodeName == "#text") {

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 4a5691a..ac35dc8 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -972,7 +972,7 @@ return;}var F=v.split(/;/);var G=[];Roo.each(F,function(p){p=p.replace(/^\s+/g,'
 }if(D.length&&D.indexOf(l)<0){return true;}G.push(p);return true;});if(G.length){A.setAttribute(n,G.join(';'));}else{A.removeAttribute(n);}}for(var i=A.attributes.length-1;i>-1;i--){var a=A.attributes[i];if(a.name.toLowerCase().substr(0,2)=='on'){A.removeAttribute(a.name);
 continue;}if(Roo.HtmlEditorCore.ablack.indexOf(a.name.toLowerCase())>-1){A.removeAttribute(a.name);continue;}if(Roo.HtmlEditorCore.aclean.indexOf(a.name.toLowerCase())>-1){cleanAttr(a.name,a.value);continue;}if(a.name=='style'){cleanStyle(a.name,a.value);
 continue;}if(a.name=='class'){if(a.value.match(/^Mso/)){A.className='';}if(a.value.match(/^body$/)){A.className='';}continue;}}this.cleanUpChildren(A);},cleanWord:function(A){if(!A){this.cleanWord(this.doc.body);return;}if(A.nodeName=='SPAN'){console.log(A);
-console.log(A.attributes);console.log(A.classList);console.log(A.childNodes);console.log(A.childNodes[0].nodeName);}if(A.nodeName=="#text"){return;}if(A.nodeName=="#comment"){A.parentNode.removeChild(A);return;}if(A.tagName.toLowerCase().match(/^(style|script|applet|embed|noframes|noscript)$/)){A.parentNode.removeChild(A);
+console.log(A.hasAttributes());console.log(A.childNodes.length);console.log(A.firstChild.nodeName);}if(A.nodeName=="#text"){return;}if(A.nodeName=="#comment"){A.parentNode.removeChild(A);return;}if(A.tagName.toLowerCase().match(/^(style|script|applet|embed|noframes|noscript)$/)){A.parentNode.removeChild(A);
 return;}if(A.tagName.toLowerCase().match(/^(meta|link|\\?xml:|st1:|o:|font)/)){while(A.childNodes.length){var cn=A.childNodes[0];A.removeChild(cn);A.parentNode.insertBefore(cn,A);}A.parentNode.removeChild(A);this.iterateChildren(A,this.cleanWord);return;}
 if(A.className.length){var cn=A.className.split(/\W+/);var B=[];Roo.each(cn,function(E){if(E.match(/Mso[a-zA-Z]+/)){return;}B.push(E);});A.className=B.length?B.join(' '):'';if(!B.length){A.removeAttribute("class");}}if(A.hasAttribute("lang")){A.removeAttribute("lang");
 }if(A.hasAttribute("style")){var C=A.getAttribute("style").split(";");var D=[];Roo.each(C,function(s){if(!s.match(/:/)){return;}var kv=s.split(":");if(kv[0].match(/^(mso-|line|font|background|margin|padding|color)/)){return;}D.push(s);});A.setAttribute("style",D.length?D.join(';'):'');

diff --git a/roojs-debug.js b/roojs-debug.js
index da451cd..13869ef 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -44066,12 +44066,16 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
             return;
         }
         
-        if(node.nodeName == 'SPAN') {
+        if(
+                node.nodeName == 'SPAN'
+//                !node.hasAttributes() &&
+//                node.childNodes.length == 1 &&
+//                node.firstChild.nodeName == "#text"
+        ) {
             console.log(node);
-            console.log(node.attributes);
-            console.log(node.classList);
-            console.log(node.childNodes);
-            console.log(node.childNodes[0].nodeName);
+            console.log(node.hasAttributes());
+            console.log(node.childNodes.length);
+            console.log(node.firstChild.nodeName);
         }
         
         if (node.nodeName == "#text") {

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index dcc971b..04ad34c 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -21615,12 +21615,16 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
             return;
         }
         
-        if(node.nodeName == 'SPAN') {
+        if(
+                node.nodeName == 'SPAN'
+//                !node.hasAttributes() &&
+//                node.childNodes.length == 1 &&
+//                node.firstChild.nodeName == "#text"
+        ) {
             console.log(node);
-            console.log(node.attributes);
-            console.log(node.classList);
-            console.log(node.childNodes);
-            console.log(node.childNodes[0].nodeName);
+            console.log(node.hasAttributes());
+            console.log(node.childNodes.length);
+            console.log(node.firstChild.nodeName);
         }
         
         if (node.nodeName == "#text") {

diff --git a/roojs-ui.js b/roojs-ui.js
index 2b840e6..cb957ec 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -944,7 +944,7 @@ return;}var F=v.split(/;/);var G=[];Roo.each(F,function(p){p=p.replace(/^\s+/g,'
 }if(D.length&&D.indexOf(l)<0){return true;}G.push(p);return true;});if(G.length){A.setAttribute(n,G.join(';'));}else{A.removeAttribute(n);}}for(var i=A.attributes.length-1;i>-1;i--){var a=A.attributes[i];if(a.name.toLowerCase().substr(0,2)=='on'){A.removeAttribute(a.name);
 continue;}if(Roo.HtmlEditorCore.ablack.indexOf(a.name.toLowerCase())>-1){A.removeAttribute(a.name);continue;}if(Roo.HtmlEditorCore.aclean.indexOf(a.name.toLowerCase())>-1){cleanAttr(a.name,a.value);continue;}if(a.name=='style'){cleanStyle(a.name,a.value);
 continue;}if(a.name=='class'){if(a.value.match(/^Mso/)){A.className='';}if(a.value.match(/^body$/)){A.className='';}continue;}}this.cleanUpChildren(A);},cleanWord:function(A){if(!A){this.cleanWord(this.doc.body);return;}if(A.nodeName=='SPAN'){console.log(A);
-console.log(A.attributes);console.log(A.classList);console.log(A.childNodes);console.log(A.childNodes[0].nodeName);}if(A.nodeName=="#text"){return;}if(A.nodeName=="#comment"){A.parentNode.removeChild(A);return;}if(A.tagName.toLowerCase().match(/^(style|script|applet|embed|noframes|noscript)$/)){A.parentNode.removeChild(A);
+console.log(A.hasAttributes());console.log(A.childNodes.length);console.log(A.firstChild.nodeName);}if(A.nodeName=="#text"){return;}if(A.nodeName=="#comment"){A.parentNode.removeChild(A);return;}if(A.tagName.toLowerCase().match(/^(style|script|applet|embed|noframes|noscript)$/)){A.parentNode.removeChild(A);
 return;}if(A.tagName.toLowerCase().match(/^(meta|link|\\?xml:|st1:|o:|font)/)){while(A.childNodes.length){var cn=A.childNodes[0];A.removeChild(cn);A.parentNode.insertBefore(cn,A);}A.parentNode.removeChild(A);this.iterateChildren(A,this.cleanWord);return;}
 if(A.className.length){var cn=A.className.split(/\W+/);var B=[];Roo.each(cn,function(E){if(E.match(/Mso[a-zA-Z]+/)){return;}B.push(E);});A.className=B.length?B.join(' '):'';if(!B.length){A.removeAttribute("class");}}if(A.hasAttribute("lang")){A.removeAttribute("lang");
 }if(A.hasAttribute("style")){var C=A.getAttribute("style").split(";");var D=[];Roo.each(C,function(s){if(!s.match(/:/)){return;}var kv=s.split(":");if(kv[0].match(/^(mso-|line|font|background|margin|padding|color)/)){return;}D.push(s);});A.setAttribute("style",D.length?D.join(';'):'');