From fc2d8f70cfc265d1cfaabf5885c0c8ebc18074f4 Mon Sep 17 00:00:00 2001 From: Alan Date: Thu, 6 Jan 2022 17:22:20 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 7 +-- roojs-debug.js | 113 +--------------------------------------------- roojs-ui-debug.js | 113 +--------------------------------------------- roojs-ui.js | 7 +-- 4 files changed, 8 insertions(+), 232 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index b6063091df..1291126547 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -1940,11 +1940,8 @@ return false;}if(!ps||ps.nodeType!=1){return false;}if(!ps||ps.tagName!='BR'){re Roo.htmleditor.FilterBlock=function(A){Roo.apply(this,A);var qa=A.node.querySelectorAll;this.removeAttributes('data-block');this.removeAttributes('contenteditable');this.removeAttributes('id');};Roo.apply(Roo.htmleditor.FilterBlock.prototype,{node:true,removeAttributes:function(A){var ar=this.node.querySelectorAll('*['+A+']'); for(var i=0;i-1){return C+'/>'; -}C+='>';var D=B===false?'':(B+' ');if(['PRE','TEXTAREA','TD','A','SPAN','B','I','S'].indexOf(A.tagName)>-1){D=false;}var cn=this.cn(A,D);return C+cn+'';},cn:function(A,B){var C=[];var ar=Array.from(A.childNodes);for(var i=0;i0&&ar[i].nodeType==3&&ar[i].nodeValue.length>0&&ar[i].nodeValue.match(/^\s+/)){if(C.length&&C[C.length-1]=="\n"+B){C.pop(); -}C.push(" ");}if(B!==false&&ar[i].nodeType==1){C.push("\n"+B);}C.push(this.tidy(ar[i],B));if(B!==false&&ar[i].nodeType==3&&ar[i].nodeValue.length>0&&ar[i].nodeValue.match(/\s+$/)){C.push("\n"+B);}}return C.join('');},attr:function(A){var B=[];for(i=0;i, , etc - var ret = "<" + node.tagName + this.attr(node) ; - - // elements with no children.. - if (['IMG', 'BR', 'HR', 'INPUT'].indexOf(node.tagName) > -1) { - return ret + '/>'; - } - ret += '>'; - - - var cindent = indent === false ? '' : (indent + ' '); - // tags where we will not pad the children.. (inline text tags etc..) - if (['PRE', 'TEXTAREA', 'TD', 'A', 'SPAN', 'B', 'I', 'S'].indexOf(node.tagName) > -1) { // or code? - cindent = false; - - - } - - var cn = this.cn(node, cindent ); - - return ret + cn + ''; - - }, - cn: function(node, indent) - { - var ret = []; - - var ar = Array.from(node.childNodes); - for (var i = 0 ; i < ar.length ; i++) { - - - - if (indent !== false // indent==false preservies everything - && i > 0 - && ar[i].nodeType == 3 - && ar[i].nodeValue.length > 0 - && ar[i].nodeValue.match(/^\s+/) - ) { - if (ret.length && ret[ret.length-1] == "\n" + indent) { - ret.pop(); // remove line break from last? - } - - ret.push(" "); // add a space if i'm a text item with a space at the front, as tidy will strip spaces. - } - if (indent !== false - && ar[i].nodeType == 1 // element - and indent is not set... - ) { - ret.push("\n" + indent); - } - - ret.push(this.tidy(ar[i], indent)); - // text + trailing indent - if (indent !== false - && ar[i].nodeType == 3 - && ar[i].nodeValue.length > 0 - && ar[i].nodeValue.match(/\s+$/) - ){ - ret.push("\n" + indent); - } - - - - - } - // what if all text? - - - return ret.join(''); - }, - - - attr : function(node) - { - var attr = []; - for(i = 0; i < node.attributes.length;i++) { - - // skip empty values? - if (!node.attributes.item(i).value.length) { - continue; - } - attr.push( node.attributes.item(i).name + '="' + - Roo.util.Format.htmlEncode(node.attributes.item(i).value) + '"' - ); - } - return attr.length ? (' ' + attr.join(' ') ) : ''; - - } - + } } /** diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 67936282b1..6e15a5e4be 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -21862,123 +21862,14 @@ Roo.htmleditor.Tidy.toString = function(node) Roo.htmleditor.Tidy.prototype = { - wrap : function(s) { - return s.replace(/\n/g, " ").replace(/(?![^\n]{1,80}$)([^\n]{1,80})\s/g, '$1\n'); - }, + tidy : function(node, indent) { - if (node.nodeType == 3) { - // text. - - - return indent === false ? node.nodeValue : this.wrap(node.nodeValue.trim()).split("\n").join("\n" + indent); - - - } - - if (node.nodeType != 1) { - return ''; - } - - - - if (node.tagName == 'BODY') { - - return this.cn(node, ''); - } - - // Prints the node tagName, such as , , etc - var ret = "<" + node.tagName + this.attr(node) ; - - // elements with no children.. - if (['IMG', 'BR', 'HR', 'INPUT'].indexOf(node.tagName) > -1) { - return ret + '/>'; - } - ret += '>'; - - - var cindent = indent === false ? '' : (indent + ' '); - // tags where we will not pad the children.. (inline text tags etc..) - if (['PRE', 'TEXTAREA', 'TD', 'A', 'SPAN', 'B', 'I', 'S'].indexOf(node.tagName) > -1) { // or code? - cindent = false; - - - } - - var cn = this.cn(node, cindent ); - - return ret + cn + ''; - - }, - cn: function(node, indent) - { - var ret = []; - - var ar = Array.from(node.childNodes); - for (var i = 0 ; i < ar.length ; i++) { - - - - if (indent !== false // indent==false preservies everything - && i > 0 - && ar[i].nodeType == 3 - && ar[i].nodeValue.length > 0 - && ar[i].nodeValue.match(/^\s+/) - ) { - if (ret.length && ret[ret.length-1] == "\n" + indent) { - ret.pop(); // remove line break from last? - } - - ret.push(" "); // add a space if i'm a text item with a space at the front, as tidy will strip spaces. - } - if (indent !== false - && ar[i].nodeType == 1 // element - and indent is not set... - ) { - ret.push("\n" + indent); - } - - ret.push(this.tidy(ar[i], indent)); - // text + trailing indent - if (indent !== false - && ar[i].nodeType == 3 - && ar[i].nodeValue.length > 0 - && ar[i].nodeValue.match(/\s+$/) - ){ - ret.push("\n" + indent); - } - - - - - } - // what if all text? - - - return ret.join(''); - }, - - - attr : function(node) - { - var attr = []; - for(i = 0; i < node.attributes.length;i++) { - - // skip empty values? - if (!node.attributes.item(i).value.length) { - continue; - } - attr.push( node.attributes.item(i).name + '="' + - Roo.util.Format.htmlEncode(node.attributes.item(i).value) + '"' - ); - } - return attr.length ? (' ' + attr.join(' ') ) : ''; - - } - + } } /** diff --git a/roojs-ui.js b/roojs-ui.js index 02acef39f0..3fe2708e79 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -995,11 +995,8 @@ return false;}if(!ps||ps.nodeType!=1){return false;}if(!ps||ps.tagName!='BR'){re Roo.htmleditor.FilterBlock=function(A){Roo.apply(this,A);var qa=A.node.querySelectorAll;this.removeAttributes('data-block');this.removeAttributes('contenteditable');this.removeAttributes('id');};Roo.apply(Roo.htmleditor.FilterBlock.prototype,{node:true,removeAttributes:function(A){var ar=this.node.querySelectorAll('*['+A+']'); for(var i=0;i-1){return C+'/>'; -}C+='>';var D=B===false?'':(B+' ');if(['PRE','TEXTAREA','TD','A','SPAN','B','I','S'].indexOf(A.tagName)>-1){D=false;}var cn=this.cn(A,D);return C+cn+'';},cn:function(A,B){var C=[];var ar=Array.from(A.childNodes);for(var i=0;i0&&ar[i].nodeType==3&&ar[i].nodeValue.length>0&&ar[i].nodeValue.match(/^\s+/)){if(C.length&&C[C.length-1]=="\n"+B){C.pop(); -}C.push(" ");}if(B!==false&&ar[i].nodeType==1){C.push("\n"+B);}C.push(this.tidy(ar[i],B));if(B!==false&&ar[i].nodeType==3&&ar[i].nodeValue.length>0&&ar[i].nodeValue.match(/\s+$/)){C.push("\n"+B);}}return C.join('');},attr:function(A){var B=[];for(i=0;i