From 0d0770ef0195e6f7c23c291f46f3f6d6ea873c43 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 17 Jun 2015 16:38:32 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-debug.js roojs-all.js --- roojs-all.js | 2 +- roojs-debug.js | 1 + roojs-ui-debug.js | 1 + roojs-ui.js | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 452da016e4..e03fc69819 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -914,7 +914,7 @@ nstyle.push(s);});A.setAttribute("style",nstyle.length?nstyle.join(';'):'');if(! B();},domToHTML:function(A,B,C){B=B||0;C=C||false;if(!A){return this.domToHTML(this.doc.body);}var j;var D=false;var E=A.nodeName;var F=Roo.util.Format.htmlEncode(A.tagName);if(E=='#text'){return C?A.nodeValue:A.nodeValue.trim();}var G='';if(E!='BODY'){var i=0;if(F){var H=[];for(i=0;i";}else {}}else {F=false;}if(['IMG','BR','HR','INPUT'].indexOf(F)>-1){return G;}if(['PRE','TEXTAREA','TD','A','SPAN'].indexOf(F)>-1){C=true;} -i=0;var J=A.childNodes.item(i);var D=true;var K='';lastnode='';while(J){var L=C;if(lastnode=='SPAN'){L=true;}if(J.nodeName=='#text'){var M=Roo.util.Format.htmlEncode(J.nodeValue);if(!L&&M.length>80){K+="\n"+(new Array(B+1)).join(" ");} +i=0;var J=A.childNodes.item(i);var D=true;var K='';lastnode='';while(J){var L=C;if(lastnode=='SPAN'){L=true;}if(J.nodeName=='#text'){var M=Roo.util.Format.htmlEncode(J.nodeValue);M=C?M:M.strip();if(!L&&M.length>80){K+="\n"+(new Array(B+1)).join(" ");} K+=M;i++;J=A.childNodes.item(i);lastNode='';continue;} D=false;K+=L?'':"\n"+(new Array(B+1)).join(" ");K+=this.domToHTML(J,B+1,C);lastnode=J.nodeName;i++;J=A.childNodes.item(i);} G+=K;if(!D){G+=C?'':"\n"+(new Array(B)).join(" ");}if(F){G+="";}return G;},applyBlacklists:function(){var w=typeof(this.owner.white)!='undefined'&&this.owner.white?this.owner.white:[];var b=typeof(this.owner.black)!='undefined'&&this.owner.black?this.owner.black:[];this.white=[];this.black=[];Roo.each(Roo.HtmlEditorCore.white,function(A){if(b.indexOf(A)>-1){return;} diff --git a/roojs-debug.js b/roojs-debug.js index f3f955f06f..035f022d3a 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -42399,6 +42399,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { // text if (currentElementChild.nodeName == '#text') { var toadd = Roo.util.Format.htmlEncode(currentElementChild.nodeValue); + toadd = nopadtext ? toadd : toadd.strip(); if (!nopad && toadd.length > 80) { innerHTML += "\n" + (new Array( depth + 1 )).join( " " ); } diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index d8bd5b154a..a00ae7be82 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -25969,6 +25969,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { // text if (currentElementChild.nodeName == '#text') { var toadd = Roo.util.Format.htmlEncode(currentElementChild.nodeValue); + toadd = nopadtext ? toadd : toadd.strip(); if (!nopad && toadd.length > 80) { innerHTML += "\n" + (new Array( depth + 1 )).join( " " ); } diff --git a/roojs-ui.js b/roojs-ui.js index 4cc26b9492..f84386a548 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -579,7 +579,7 @@ nstyle.push(s);});A.setAttribute("style",nstyle.length?nstyle.join(';'):'');if(! B();},domToHTML:function(A,B,C){B=B||0;C=C||false;if(!A){return this.domToHTML(this.doc.body);}var j;var D=false;var E=A.nodeName;var F=Roo.util.Format.htmlEncode(A.tagName);if(E=='#text'){return C?A.nodeValue:A.nodeValue.trim();}var G='';if(E!='BODY'){var i=0;if(F){var H=[];for(i=0;i";}else {}}else {F=false;}if(['IMG','BR','HR','INPUT'].indexOf(F)>-1){return G;}if(['PRE','TEXTAREA','TD','A','SPAN'].indexOf(F)>-1){C=true;} -i=0;var J=A.childNodes.item(i);var D=true;var K='';lastnode='';while(J){var L=C;if(lastnode=='SPAN'){L=true;}if(J.nodeName=='#text'){var M=Roo.util.Format.htmlEncode(J.nodeValue);if(!L&&M.length>80){K+="\n"+(new Array(B+1)).join(" ");} +i=0;var J=A.childNodes.item(i);var D=true;var K='';lastnode='';while(J){var L=C;if(lastnode=='SPAN'){L=true;}if(J.nodeName=='#text'){var M=Roo.util.Format.htmlEncode(J.nodeValue);M=C?M:M.strip();if(!L&&M.length>80){K+="\n"+(new Array(B+1)).join(" ");} K+=M;i++;J=A.childNodes.item(i);lastNode='';continue;} D=false;K+=L?'':"\n"+(new Array(B+1)).join(" ");K+=this.domToHTML(J,B+1,C);lastnode=J.nodeName;i++;J=A.childNodes.item(i);} G+=K;if(!D){G+=C?'':"\n"+(new Array(B)).join(" ");}if(F){G+="";}return G;},applyBlacklists:function(){var w=typeof(this.owner.white)!='undefined'&&this.owner.white?this.owner.white:[];var b=typeof(this.owner.black)!='undefined'&&this.owner.black?this.owner.black:[];this.white=[];this.black=[];Roo.each(Roo.HtmlEditorCore.white,function(A){if(b.indexOf(A)>-1){return;} -- 2.39.2