roojs-bootstrap.js

roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index e5cf2d4..05786f9 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -9072,6 +9072,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                 last = i
             }
             total += w;
+            cols.push(w);
         }
         
         
@@ -9087,7 +9088,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                 hidden = '';
                 
                 // we can honour xs/sm/md/xl ?
-                var w = cm.getColumnWidth(i, sz) * unitWidth;
+                var w = cols[i] * unitWidth;
                 if (w===0) {
                     hidden = 'display:none;';
                 }

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 83a21e4..2c6319b 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -374,8 +374,8 @@ if(this.footer){this.footer.parentId=this.id;this.footer.onRender(this.el.select
 );}this.store.on('load',this.onLoad,this);this.store.on('beforeload',this.onBeforeLoad,this);this.store.on('update',this.onUpdate,this);this.store.on('add',this.onAdd,this);this.store.on("clear",this.clear,this);this.el.on("contextmenu",this.onContextMenu,this);
 this.cm.on("headerchange",this.onHeaderChange,this);this.cm.on("hiddenchange",this.onHiddenChange,this,arguments);this.bodyEl.on("click",this.onClick,this);this.bodyEl.on("dblclick",this.onDblClick,this);this.bodyEl.on('scroll',this.onBodyScroll,this);this.relayEvents(this.bodyEl,["mousedown","mouseup","mouseover","mouseout","keypress"]);
 this.resizeProxy=Roo.get(document.body).createChild({cls:"x-grid-resize-proxy",html:' '});if(this.headEl&&this.enableColumnResize!==false&&Roo.grid.SplitDragZone){new Roo.grid.SplitDragZone(this,this.headEl.dom,false);}this.initCSS();},getView:function(){return this;
-},initCSS:function(){var cm=this.cm,A=[];this.CSS.removeStyleSheet(this.id+'-cssrules');var sz=Roo.getGridSize();var B=0;var C=-1;var D=[];for(var i=0,E=cm.getColumnCount();i<E;i++){var w=cm.getColumnWidth(i,sz);if(w>0){C=i}B+=w;}var F=Math.floor(this.bodyEl.dom.clientWidth/B);
-var G=this.bodyEl.dom.clientWidth-(F*B);var H,I;for(var i=0,E=cm.getColumnCount();i<E;i++){var H='display:none;';var I='width:0px';if(!cm.isHidden(i)){H='';var w=cm.getColumnWidth(i,sz)*F;if(w===0){H='display:none;';}if(i==C){w+=G;}I="width:"+w+"px;";}A.push('#',this.id,' .x-col-',i," {\n",cm.config[i].css,I,H,"\n}\n",'#',this.id,' .x-hcol-',i," {\n",I,H,"}\n");
+},initCSS:function(){var cm=this.cm,A=[];this.CSS.removeStyleSheet(this.id+'-cssrules');var sz=Roo.getGridSize();var B=0;var C=-1;var D=[];for(var i=0,E=cm.getColumnCount();i<E;i++){var w=cm.getColumnWidth(i,sz);if(w>0){C=i}B+=w;D.push(w);}var F=Math.floor(this.bodyEl.dom.clientWidth/B);
+var G=this.bodyEl.dom.clientWidth-(F*B);var H,I;for(var i=0,E=cm.getColumnCount();i<E;i++){var H='display:none;';var I='width:0px';if(!cm.isHidden(i)){H='';var w=D[i]*F;if(w===0){H='display:none;';}if(i==C){w+=G;}I="width:"+w+"px;";}A.push('#',this.id,' .x-col-',i," {\n",cm.config[i].css,I,H,"\n}\n",'#',this.id,' .x-hcol-',i," {\n",I,H,"}\n");
 }Roo.log(A.join(''));this.CSS.createStyleSheet(A.join(''),this.id+'-cssrules');},onContextMenu:function(e,t){this.processEvent("contextmenu",e);},processEvent:function(A,e){if(A!='touchstart'){this.fireEvent(A,e);}var t=e.getTarget();var B=Roo.get(t);if(!B){return;
 }if(B.findParent('tfoot',false,true)){return;}if(B.findParent('thead',false,true)){if(e.getTarget().nodeName.toLowerCase()!='th'){B=Roo.get(t).findParent('th',false,true);if(!B){Roo.log("failed to find th in thead?");Roo.log(e.getTarget());return;}}var C=B.dom.cellIndex;
 var D=A=='touchstart'?'click':A;this.fireEvent("header"+D,this,C,e);return;}if(e.getTarget().nodeName.toLowerCase()!='td'){B=Roo.get(t).findParent('td',false,true);if(!B){Roo.log("failed to find th in tbody?");Roo.log(e.getTarget());return;}}var E=B.findParent('tr',false,true);