Roo/bootstrap/panel/Grid.js

roojs-bootstrap.js
roojs-bootstrap-debug.js

diff --git a/Roo/bootstrap/panel/Grid.js b/Roo/bootstrap/panel/Grid.js
index ab1b388..ea9994f 100644 (file)
--- a/Roo/bootstrap/panel/Grid.js
+++ b/Roo/bootstrap/panel/Grid.js
@@ -81,7 +81,7 @@ Roo.extend(Roo.bootstrap.panel.Grid, Roo.bootstrap.panel.Content, {
         if(!this.ignoreResize(width, height)){
             var grid = this.grid;
             var size = this.adjustForComponents(width, height);
-            var gridel = grid.getGridEl()
+            var gridel = grid.getGridEl();
             gridel.setSize(size.width, size.height);
             /*
             var thd = grid.getGridEl().select('thead',true).first();

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index f05c33c..c9c288c 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -6680,7 +6680,8 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
      * @return {Element} The element
      */
     autoSize : function(){
-        var ctr = Roo.get(this.container.dom.parentElement);
+        //var ctr = Roo.get(this.container.dom.parentElement);
+        var ctr = Roo.get(this.container.dom);
         
         var thd = this.getGridEl().select('thead',true).first();
         var tbd = this.getGridEl().select('tbody', true).first();
@@ -6698,17 +6699,12 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
         this.getGridEl().select('tr',true).setWidth(cw);
         
         return; // we doe not have a view in this design..
-        if(this.rendered){
-            this.view.layout();
-            if(this.view.adjustForScroll){
-                this.view.adjustForScroll();
-            }
-        }
+        
     },
     onBodyScroll: function()
     {
         
-        Roo.log("body scrolled');" + this.mainBody.dom.scrollLeft);
+        //Roo.log("body scrolled');" + this.mainBody.dom.scrollLeft);
         this.mainHead.setStyle({
                     'position' : 'relative',
                     'left': (-1* this.mainBody.dom.scrollLeft) + 'px'
@@ -32084,6 +32080,8 @@ Roo.extend(Roo.bootstrap.layout.Basic, Roo.util.Observable,
  * @cfg {Boolean}   split           To show the splitter
  * @cfg {Boolean}   toolbar         xtype configuration for a toolbar - shows on right of tabbar
  * 
+ * @cfg {string}   cls             Extra CSS classes to add to region
+ * 
  * @cfg {Roo.bootstrap.layout.Manager}   mgr The manager
  * @cfg {string}   region  the region that it inhabits..
  *
@@ -32105,7 +32103,10 @@ Roo.bootstrap.layout.Region = function(config)
     var dh = Roo.DomHelper;
     /** This region's container element 
     * @type Roo.Element */
-    this.el = dh.append(mgr.el.dom, {tag: "div", cls: "roo-layout-region roo-layout-panel roo-layout-panel-" + this.position}, true);
+    this.el = dh.append(mgr.el.dom, {
+            tag: "div",
+            cls: (config.cls || '') + " roo-layout-region roo-layout-panel roo-layout-panel-" + this.position
+        }, true);
     /** This region's title element 
     * @type Roo.Element */
 
@@ -33863,7 +33864,8 @@ Roo.extend(Roo.bootstrap.panel.Grid, Roo.bootstrap.panel.Content, {
         if(!this.ignoreResize(width, height)){
             var grid = this.grid;
             var size = this.adjustForComponents(width, height);
-            grid.getGridEl().setSize(size.width, size.height);
+            var gridel = grid.getGridEl();
+            gridel.setSize(size.width, size.height);
             /*
             var thd = grid.getGridEl().select('thead',true).first();
             var tbd = grid.getGridEl().select('tbody', true).first();

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index e64246d..2966824 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -262,10 +262,9 @@ return (typeof(B[A])=='undefined')?false:B[A];},renderRow:function(cm,ds,A){var
 }if(typeof(E.cls)!='undefined'){td.cls=(typeof(td.cls)=='undefined')?E.cls:(td.cls+' '+E.cls);}['xs','sm','md','lg'].map(function(I){if(typeof(E[I])=='undefined'){return;}if(!E[I]){td.cls+=' hidden-'+I;return;}td.cls+=' col-'+I+'-'+E[I];});B.cn.push(td);}
 B.cellObjects=C;return B;},onBeforeLoad:function(){},clear:function(){this.el.select('tbody',true).first().dom.innerHTML='';},setRowVisibility:function(A,B){var bt=this.mainBody.dom;var C=this.el.select('tbody > tr',true).elements;if(typeof(C[A])=='undefined'){return;
 }C[A].dom.style.display=B?'':'none';},getSelectionModel:function(){if(!this.selModel){this.selModel=new Roo.bootstrap.Table.RowSelectionModel();}return this.selModel;},renderCellObject:function(r){var A=this;var t=r.cfg.render(r.container);if(r.cfg.cn){Roo.each(r.cfg.cn,function(c){var B={container:t.getChildContainer(),cfg:c}
-;A.renderCellObject(B);})}},getRowIndex:function(A){var B=-1;Roo.each(this.el.select('tbody > tr',true).elements,function(el,C){if(el!=A){return;}B=C;});return B;},getGridEl:function(){return this.container;},autoSize:function(){var A=Roo.get(this.container.dom.parentElement);
+;A.renderCellObject(B);})}},getRowIndex:function(A){var B=-1;Roo.each(this.el.select('tbody > tr',true).elements,function(el,C){if(el!=A){return;}B=C;});return B;},getGridEl:function(){return this.container;},autoSize:function(){var A=Roo.get(this.container.dom);
 var B=this.getGridEl().select('thead',true).first();var C=this.getGridEl().select('tbody',true).first();var cw=A.getWidth();if(C){C.setSize(A.getWidth(),A.getHeight()-B.getHeight());var D=(C.dom.offsetWidth-C.dom.clientWidth);cw-=D;}cw=Math.max(cw,this.totalWidth);
-this.getGridEl().select('tr',true).setWidth(cw);return;if(this.rendered){this.view.layout();if(this.view.adjustForScroll){this.view.adjustForScroll();}}},onBodyScroll:function(){Roo.log("body scrolled');"+this.mainBody.dom.scrollLeft);this.mainHead.setStyle({'position':'relative','left':(-1*this.mainBody.dom.scrollLeft)+'px'}
-);}});
+this.getGridEl().select('tr',true).setWidth(cw);return;},onBodyScroll:function(){this.mainHead.setStyle({'position':'relative','left':(-1*this.mainBody.dom.scrollLeft)+'px'});}});
 // Roo/bootstrap/TableCell.js
 Roo.bootstrap.TableCell=function(A){Roo.bootstrap.TableCell.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.TableCell,Roo.bootstrap.Component,{html:false,cls:false,tag:false,abbr:false,align:false,axis:false,bgcolor:false,charoff:false,colspan:false,headers:false,height:false,nowrap:false,rowspan:false,scope:false,valign:false,width:false,getAutoCreate:function(){var A=Roo.apply({}
 ,Roo.bootstrap.TableCell.superclass.getAutoCreate.call(this));A={tag:'td'};if(this.tag){A.tag=this.tag;}if(this.html){A.html=this.html}if(this.cls){A.cls=this.cls}if(this.abbr){A.abbr=this.abbr}if(this.align){A.align=this.align}if(this.axis){A.axis=this.axis}
@@ -1342,7 +1341,7 @@ if(!A.background){this.setActivePanel(A);if(this.config.initialSize&&this.panels
 },remove:function(A,B){A=this.getPanel(A);if(!A){return null;}var e={};this.fireEvent("beforeremove",this,A,e);if(e.cancel===true){return null;}var C=A.getId();this.panels.removeKey(C);return A;},getPanel:function(id){if(typeof id=="object"){return id;}return this.panels.get(id);
 },getPosition:function(){return this.position;}});
 // Roo/bootstrap/layout/Region.js
-Roo.bootstrap.layout.Region=function(A){var B=A.mgr;var C=A.region;A.skipConfig=true;Roo.bootstrap.layout.Region.superclass.constructor.call(this,A);var dh=Roo.DomHelper;this.el=dh.append(B.el.dom,{tag:"div",cls:"roo-layout-region roo-layout-panel roo-layout-panel-"+this.position}
+Roo.bootstrap.layout.Region=function(A){var B=A.mgr;var C=A.region;A.skipConfig=true;Roo.bootstrap.layout.Region.superclass.constructor.call(this,A);var dh=Roo.DomHelper;this.el=dh.append(B.el.dom,{tag:"div",cls:(A.cls||'')+" roo-layout-region roo-layout-panel roo-layout-panel-"+this.position}
 ,true);this.titleEl=dh.append(this.el.dom,{tag:"div",unselectable:"on",cls:"roo-unselectable roo-layout-panel-hd breadcrumb roo-layout-title-"+this.position,children:[{tag:"span",cls:"roo-unselectable roo-layout-panel-hd-text",unselectable:"on",html:" "}
 ,{tag:"div",cls:"roo-unselectable roo-layout-panel-hd-tools",unselectable:"on"}]},true);this.titleEl.enableDisplayMode();this.titleTextEl=this.titleEl.dom.firstChild;this.tools=Roo.get(this.titleEl.dom.childNodes[1],true);this.createBody(A);this.visible=true;
 this.collapsed=false;if(A.hideWhenEmpty){this.hide();this.on("paneladded",this.validateVisibility,this);this.on("panelremoved",this.validateVisibility,this);}this.applyConfig(A);};Roo.extend(Roo.bootstrap.layout.Region,Roo.bootstrap.layout.Basic,{createBody:function(){this.bodyEl=this.el.createChild({tag:"div",cls:"roo-layout-panel-body tab-content"}
@@ -1427,7 +1426,7 @@ Roo.bootstrap.panel.Grid=function(A){this.wrapper=Roo.DomHelper.append(document.
 delete A.toolbar.items;}var C=[];this.toolbar.render(B);for(var i=0;i<ti.length;i++){C.push(this.toolbar.addxtype(Roo.apply({},ti[i])));}this.toolbar.items=C;delete A.toolbar;}this.wrapper.dom.appendChild(A.grid.getGridEl().dom);A.el=this.wrapper;Roo.bootstrap.panel.Grid.superclass.constructor.call(this,A);
 if(this.footer&&!this.footer.el&&this.footer.xtype){var D=this.grid.getView().getFooterPanel(true);this.footer.dataSource=this.grid.dataSource;this.footer=Roo.factory(this.footer,Roo);this.footer.render(D);}A.grid.monitorWindowResize=false;A.grid.autoHeight=false;
 A.grid.autoWidth=false;this.grid=A.grid;this.grid.getGridEl().replaceClass("x-layout-inactive-content","x-layout-component-panel");};Roo.extend(Roo.bootstrap.panel.Grid,Roo.bootstrap.panel.Content,{getId:function(){return this.grid.id;},getGrid:function(){return this.grid;
-},setSize:function(A,B){if(!this.ignoreResize(A,B)){var C=this.grid;var D=this.adjustForComponents(A,B);C.getGridEl().setSize(D.width,D.height);C.autoSize();}},beforeSlide:function(){this.grid.getView().scroller.clip();},afterSlide:function(){this.grid.getView().scroller.unclip();
+},setSize:function(A,B){if(!this.ignoreResize(A,B)){var C=this.grid;var D=this.adjustForComponents(A,B);var E=C.getGridEl();E.setSize(D.width,D.height);C.autoSize();}},beforeSlide:function(){this.grid.getView().scroller.clip();},afterSlide:function(){this.grid.getView().scroller.unclip();
 },destroy:function(){this.grid.destroy();delete this.grid;Roo.bootstrap.panel.Grid.superclass.destroy.call(this);}});
 // Roo/bootstrap/panel/Nest.js
 Roo.bootstrap.panel.Nest=function(A){A.el=A.layout.getEl();Roo.bootstrap.panel.Nest.superclass.constructor.call(this,A);A.layout.monitorWindowResize=false;this.layout=A.layout;this.layout.getEl().addClass("roo-layout-nested-layout");};Roo.extend(Roo.bootstrap.panel.Nest,Roo.bootstrap.panel.Content,{setSize:function(A,B){if(!this.ignoreResize(A,B)){var C=this.adjustForComponents(A,B);