From: leon <leon@roojs.com>
Date: Mon, 27 Jun 2022 06:50:54 +0000 (+0800)
Subject: roojs-core.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=c9974e46a3b9126b392376ab8fda03b110dca7bf

roojs-core.js
roojs-core-debug.js
roojs-ui.js
roojs-ui-debug.js
roojs-all.js
roojs-debug.js
---

diff --git a/roojs-all.js b/roojs-all.js
index fd00950f49..5d88343ef0 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2053,7 +2053,7 @@ c<cd.col+cd.colspan;c++){if(r==cd.row&&c==cd.col){this.node.removeAttribute('row
 },redrawAllCells:function(A){var B=this.node.closest('tr').closest('table');var C=B.rows[0].parentNode;Array.from(B.rows).forEach(function(r,ri){Array.from(r.cells).forEach(function(ce,ci){ce.parentNode.removeChild(ce);});r.parentNode.removeChild(r);});for(var r=0;
 r<A.length;r++){var re=B.rows[r];var re=B.ownerDocument.createElement('tr');C.appendChild(re);for(var c=0;c<A[r].length;c++){if(A[r][c].cell===false){continue;}re.appendChild(A[r][c].cell);A[r][c].cell=false;}}},updateWidths:function(A){for(var r=0;r<A.length;
 r++){for(var c=0;c<A[r].length;c++){if(A[r][c].cell===false){continue;}if(this.colWidths[0]!=false&&A[r][c].colspan<2){var el=Roo.htmleditor.Block.factory(A[r][c].cell);el.width=Math.floor(this.colWidths[c])+'%';el.updateElement(el.node);}A[r][c].cell=false;
-}}},normalizeWidths:function(A){console.log("htmleditor.BlockTd normalizeWidths");console.log("colWidths 0");console.log(col.Widths[0]);console.log("colWidths 1");console.log(col.Wdiths[1]);if(this.colWidths[0]===false){var nw=100.0/this.colWidths.length;
+}}},normalizeWidths:function(A){console.log("htmleditor.BlockTd normalizeWidths");console.log("colWidths 0");console.log(this.colWidths[0]);console.log("colWidths 1");console.log(this.colWdiths[1]);if(this.colWidths[0]===false){var nw=100.0/this.colWidths.length;
 this.colWidths.forEach(function(w,i){this.colWidths[i]=nw;},this);return;}var t=0,B=[];this.colWidths.forEach(function(w,i){this.colWidths[i]=this.colWidths[i]==''?0:(this.colWidths[i]+'').replace(/[^0-9]+/g,'')*1;var D=this.colWidths[i];if(D>0){t+=D;return;
 }B.push(i);},this);var nc=this.colWidths.length;if(B.length){var C=(nc-B.length)/(1.0*nc);var t=C*t;var ew=(100-t)/(1.0*B.length);this.colWidths.forEach(function(w,i){if(w>0){this.colWidths[i]=w*C;return;}this.colWidths[i]=ew;},this);}},shrinkColumn:function(){console.log("htmleditor.BlockTd shrinkColumn");
 var A=this.toTableArray();console.log(A);this.normalizeWidths(A);var B=this.cellData.col;var nw=this.colWidths[B]*0.8;if(nw<5){return;}var C=(this.colWidths[B]*0.2)/(this.colWidths.length-1);this.colWidths.forEach(function(w,i){if(i==B){this.colWidths[i]=nw;
diff --git a/roojs-debug.js b/roojs-debug.js
index 1708dd6be1..38edd23149 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -49562,9 +49562,9 @@ Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
     {
         console.log("htmleditor.BlockTd normalizeWidths");
         console.log("colWidths 0");
-        console.log(col.Widths[0]);
+        console.log(this.colWidths[0]);
         console.log("colWidths 1");
-        console.log(col.Wdiths[1]);
+        console.log(this.colWdiths[1]);
     
         if (this.colWidths[0] === false) {
             var nw = 100.0 / this.colWidths.length;
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 71c762b8cc..9b1962d5de 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -25070,9 +25070,9 @@ Roo.extend(Roo.htmleditor.BlockTd, Roo.htmleditor.Block, {
     {
         console.log("htmleditor.BlockTd normalizeWidths");
         console.log("colWidths 0");
-        console.log(col.Widths[0]);
+        console.log(this.colWidths[0]);
         console.log("colWidths 1");
-        console.log(col.Wdiths[1]);
+        console.log(this.colWdiths[1]);
     
         if (this.colWidths[0] === false) {
             var nw = 100.0 / this.colWidths.length;
diff --git a/roojs-ui.js b/roojs-ui.js
index 32456fecf1..cea452353a 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1107,7 +1107,7 @@ c<cd.col+cd.colspan;c++){if(r==cd.row&&c==cd.col){this.node.removeAttribute('row
 },redrawAllCells:function(A){var B=this.node.closest('tr').closest('table');var C=B.rows[0].parentNode;Array.from(B.rows).forEach(function(r,ri){Array.from(r.cells).forEach(function(ce,ci){ce.parentNode.removeChild(ce);});r.parentNode.removeChild(r);});for(var r=0;
 r<A.length;r++){var re=B.rows[r];var re=B.ownerDocument.createElement('tr');C.appendChild(re);for(var c=0;c<A[r].length;c++){if(A[r][c].cell===false){continue;}re.appendChild(A[r][c].cell);A[r][c].cell=false;}}},updateWidths:function(A){for(var r=0;r<A.length;
 r++){for(var c=0;c<A[r].length;c++){if(A[r][c].cell===false){continue;}if(this.colWidths[0]!=false&&A[r][c].colspan<2){var el=Roo.htmleditor.Block.factory(A[r][c].cell);el.width=Math.floor(this.colWidths[c])+'%';el.updateElement(el.node);}A[r][c].cell=false;
-}}},normalizeWidths:function(A){console.log("htmleditor.BlockTd normalizeWidths");console.log("colWidths 0");console.log(col.Widths[0]);console.log("colWidths 1");console.log(col.Wdiths[1]);if(this.colWidths[0]===false){var nw=100.0/this.colWidths.length;
+}}},normalizeWidths:function(A){console.log("htmleditor.BlockTd normalizeWidths");console.log("colWidths 0");console.log(this.colWidths[0]);console.log("colWidths 1");console.log(this.colWdiths[1]);if(this.colWidths[0]===false){var nw=100.0/this.colWidths.length;
 this.colWidths.forEach(function(w,i){this.colWidths[i]=nw;},this);return;}var t=0,B=[];this.colWidths.forEach(function(w,i){this.colWidths[i]=this.colWidths[i]==''?0:(this.colWidths[i]+'').replace(/[^0-9]+/g,'')*1;var D=this.colWidths[i];if(D>0){t+=D;return;
 }B.push(i);},this);var nc=this.colWidths.length;if(B.length){var C=(nc-B.length)/(1.0*nc);var t=C*t;var ew=(100-t)/(1.0*B.length);this.colWidths.forEach(function(w,i){if(w>0){this.colWidths[i]=w*C;return;}this.colWidths[i]=ew;},this);}},shrinkColumn:function(){console.log("htmleditor.BlockTd shrinkColumn");
 var A=this.toTableArray();console.log(A);this.normalizeWidths(A);var B=this.cellData.col;var nw=this.colWidths[B]*0.8;if(nw<5){return;}var C=(this.colWidths[B]*0.2)/(this.colWidths.length-1);this.colWidths.forEach(function(w,i){if(i==B){this.colWidths[i]=nw;