roojs-bootstrap.js

roojs-bootstrap-debug.js
Roo/bootstrap/Table.js
roojs-core.js
roojs-core-debug.js

diff --git a/Roo/bootstrap/Table.js b/Roo/bootstrap/Table.js
index c9f1ee5..cbf0150 100644 (file)
--- a/Roo/bootstrap/Table.js
+++ b/Roo/bootstrap/Table.js
@@ -463,8 +463,8 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
             var width = "width:" + w+ "px;";
             
             styles.push(
-                    '#' , this.id , ' .x-col-' , i, " {\n", cm.config[i].css, width, "\n}\n",
-                    '#' , this.id , ' .x-hcol-' , i, " {\n", width, "}\n"
+                    '#' , this.id , ' .x-col-' , i, " {\n", cm.config[i].css, width, hidden, "\n}\n",
+                    '#' , this.id , ' .x-hcol-' , i, " {\n", width, hidden,"}\n"
             );
         }
         Roo.log(styles.join(''));

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 59b0c92..c25fedf 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -9086,6 +9086,9 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
             }
             // we can honour xs/sm/md/xl ?
             var w = cm.getColumnWidth(i, sz) * unitWidth;
+            if (w===0) {
+                hidden = 'display:none;';
+            }
             // width should return a small number...
             if (i == last) {
                 w+=rem; // add the remaining with..
@@ -9094,7 +9097,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
             var width = "width:" + w+ "px;";
             
             styles.push(
-                    '#' , this.id , ' .x-col-' , i, " {\n", cm.config[i].css, width, "\n}\n",
+                    '#' , this.id , ' .x-col-' , i, " {\n", cm.config[i].css, width, hidden, "\n}\n",
                     '#' , this.id , ' .x-hcol-' , i, " {\n", width, "}\n"
             );
         }

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 025faaa..fa0a105 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -375,7 +375,7 @@ if(this.footer){this.footer.parentId=this.id;this.footer.onRender(this.el.select
 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=[];for(var i=0,D=cm.getColumnCount();i<D;i++){var w=cm.getColumnWidth(i,sz);if(w>0){C.push(i);}B+=w;}var E=Math.floor(this.bodyEl.dom.clientWidth/B);
-var F=this.bodyEl.dom.clientWidth-(E*B);var G=C.pop();for(var i=0,D=cm.getColumnCount();i<D;i++){var H='';if(cm.isHidden(i)){H='display:none;';}var w=cm.getColumnWidth(i,sz)*E;if(i==G){w+=F;}var I="width:"+w+"px;";A.push('#',this.id,' .x-col-',i," {\n",cm.config[i].css,I,"\n}\n",'#',this.id,' .x-hcol-',i," {\n",I,"}\n");
+var F=this.bodyEl.dom.clientWidth-(E*B);var G=C.pop();for(var i=0,D=cm.getColumnCount();i<D;i++){var H='';if(cm.isHidden(i)){H='display:none;';}var w=cm.getColumnWidth(i,sz)*E;if(w===0){H='display:none;';}if(i==G){w+=F;}var 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,"}\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);