Roo/bootstrap/Table.js

[roojs1] / Roo / bootstrap / Table.js

diff --git a/Roo/bootstrap/Table.js b/Roo/bootstrap/Table.js
index 796ebbd..e14e177 100644 (file)
--- a/Roo/bootstrap/Table.js
+++ b/Roo/bootstrap/Table.js
@@ -1171,9 +1171,11 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
         var h_row = this.el.dom.getElementsByClassName("x-hcol-"+col_index);
         
         
-        for(var j = 0; w.length; j++) {
+        for(var j = 0; j < w.length; j++) {
             
-            Roo.log(w[j]);
+            if(!w[j]) {
+                continue;
+            }
             
             var size_cls = w[j].split("-");
             
@@ -1185,17 +1187,22 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                 continue;
             }
             
+            if(!h_row[0].classList.contains("col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]])) {
+                continue;
+            }
+            
             h_row[0].classList.replace(
                 "col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]],
                 "col-"+size_cls[0]+"-"+size_cls[1]
             );
             
-            this.colModel.config[col_index][size_cls[0]] = size_cls[1];
         }
         
+        this.colModel.config[col_index][size_cls[0]] = size_cls[1];
+        
         for(var i = 0; i < rows.length; i++) {
             
-            for(var j = 0; w.length; j++) {
+            for(var j = 0; j < w.length; j++) {
                 
                 var size_cls = w[j].split("-");
                 
@@ -1207,6 +1214,10 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                     continue;
                 }
                 
+                if(!rows[i].classList.contains("col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]])) {
+                    continue;
+                }
+                
                 rows[i].classList.replace(
                     "col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]],
                     "col-"+size_cls[0]+"-"+size_cls[1]