sync

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index f3064b6..0dc7ff6 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -7115,7 +7115,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++) {
+            
+            if(!w[j]) {
+                continue;
+            }
             
             var size_cls = w[j].split("-");
             
@@ -7127,17 +7131,16 @@ 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];
-        }
-        
-        for(var i = 0; i < rows.length; i++) {
-            
-            for(var j = 0; w.length; j++) {
+            for(var i = 0; i < rows.length; i++) {
                 
                 var size_cls = w[j].split("-");
                 
@@ -7149,11 +7152,17 @@ 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]
                 );
             }
+            
+            this.colModel.config[col_index][size_cls[0]] = size_cls[1];
         }
     }
 });
@@ -19161,7 +19170,7 @@ Roo.extend(Roo.bootstrap.DateField, Roo.bootstrap.Input,  {
             case 18: // alt
                 break;
             default :
-                this.hide();
+                this.hidePopup();
                 
         }
     },
@@ -24723,7 +24732,7 @@ Roo.extend(Roo.bootstrap.PagingToolbar, Roo.bootstrap.NavSimplebar, {
         this.first = this.navgroup.addItem({
             tooltip: this.firstText,
             cls: "prev",
-            icon : 'fa fa-backward',
+            icon : 'fa fa-step-backward',
             disabled: true,
             preventDefault: true,
             listeners : { click : this.onClick.createDelegate(this, ["first"]) }
@@ -24732,7 +24741,7 @@ Roo.extend(Roo.bootstrap.PagingToolbar, Roo.bootstrap.NavSimplebar, {
         this.prev =  this.navgroup.addItem({
             tooltip: this.prevText,
             cls: "prev",
-            icon : 'fa fa-step-backward',
+            icon : 'fa fa-backward',
             disabled: true,
             preventDefault: true,
             listeners : { click :  this.onClick.createDelegate(this, ["prev"]) }
@@ -24760,14 +24769,14 @@ Roo.extend(Roo.bootstrap.PagingToolbar, Roo.bootstrap.NavSimplebar, {
         this.next = this.navgroup.addItem({
             tooltip: this.nextText,
             cls: "next",
-            html : ' <i class="fa fa-step-forward">',
+            html : ' <i class="fa fa-forward">',
             disabled: true,
             preventDefault: true,
             listeners : { click :  this.onClick.createDelegate(this, ["next"]) }
         });
         this.last = this.navgroup.addItem({
             tooltip: this.lastText,
-            icon : 'fa fa-forward',
+            icon : 'fa fa-step-forward',
             cls: "next",
             disabled: true,
             preventDefault: true,
@@ -40504,6 +40513,13 @@ Roo.extend(Roo.bootstrap.MoneyField, Roo.bootstrap.ComboBox, {
             cls: 'hidden-number-input'
         };
         
+        if(
+            this.maxLength &&
+            Number.isInteger(this.maxLength * 1)
+        ) {
+            input.maxlength = this.maxLength; 
+        }
+        
         if (this.name) {
             hiddenInput.name = this.name;
         }