From b283943958021133e6884662e034d3841303d76e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 7 Jul 2017 09:38:48 +0800 Subject: [PATCH] Roo/bootstrap/layout/Border.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/layout/Border.js | 2 +- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Roo/bootstrap/layout/Border.js b/Roo/bootstrap/layout/Border.js index 63b62b1401..f44111b7df 100644 --- a/Roo/bootstrap/layout/Border.js +++ b/Roo/bootstrap/layout/Border.js @@ -351,7 +351,7 @@ layout.addxtype({ cfg.background = false; } - ret = new cfg.ns[cfg.xtype](cfg); // new panel!!!!! + ret = new cfg.xns[cfg.xtype](cfg); // new panel!!!!! this.add(region, ret); diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 0c769c99d8..d5f6cef962 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -31461,7 +31461,7 @@ layout.addxtype({ cfg.background = false; } - ret = new cfg.ns[cfg.xtype](cfg); // new panel!!!!! + ret = new cfg.xns[cfg.xtype](cfg); // new panel!!!!! this.add(region, ret); diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 139ffb1f90..15a24312c8 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1317,7 +1317,7 @@ b.height=C-(m.top+m.bottom);var L=(b.width+m.left+m.right);b.x=w-L+m.left;b.y=D+ },findPanel:function(A){var rs=this.regions;for(var B in rs){if(typeof rs[B]!="function"){var p=rs[B].getPanel(A);if(p){return p;}}}return null;},showPanel:function(A){var rs=this.regions;for(var B in rs){var r=rs[B];if(typeof r!="function"){if(r.hasPanel(A)){return r.showPanel(A); }}}return null;},addxtype:function(A){var B=false;if(typeof(A.region)=='undefined'){Roo.log("Failed to add Panel, region was not set");Roo.log(A);return false;}var C=A.region;delete A.region;var D=[];if(A.items){D=A.items;delete A.items;}var nb=false;switch(A.xtype){case 'Content':case 'Scroll':case 'View':A.autoCreate=true; B=new A.xns[A.xtype](A);this.add(C,B);break;case 'Nest':var E=A.layout;E.el=this.el.createChild();E.items=E.items||[];delete A.layout;D=E.items;if(C=='center'&&this.active&&this.getRegion('center').panels.length<1){A.background=false;}A.layout=new Roo.bootstrap.layout.Border(E); -B=new A.xns[A.xtype](A);this.add(C,B);nb={};break;case 'Grid':var el=this.el.createChild();A.grid.el=el;A.grid=new A.grid.ns[A.grid.xtype](A.grid);if(C=='center'&&this.active){A.background=false;}B=new A.ns[A.xtype](A);this.add(C,B);if(A.background){B.on('activate',function(gp){if(!gp.grid.rendered){gp.grid.render(); +B=new A.xns[A.xtype](A);this.add(C,B);nb={};break;case 'Grid':var el=this.el.createChild();A.grid.el=el;A.grid=new A.grid.ns[A.grid.xtype](A.grid);if(C=='center'&&this.active){A.background=false;}B=new A.xns[A.xtype](A);this.add(C,B);if(A.background){B.on('activate',function(gp){if(!gp.grid.rendered){gp.grid.render(); }});}else{grid.render();}break;case 'Border':B=this;break;default:Roo.log(A);throw "Can not add '"+A.xtype+"' to Border";return null;}this.beginUpdate();var C='';var F={};Roo.each(D,function(i){C=nb&&i.region?i.region:false;var G=B.addxtype(i);if(C){nb[C]=nb[C]==undefined?0:nb[C]+1; if(!i.background){F[C]=nb[C];}}});this.endUpdate();if(nb){for(var r in F){C=this.getRegion(r);if(C){C.showPanel(F[r]);}}}return B;},factory:function(A){var B=Roo.bootstrap.layout.Border.regions;var C=A.region;A.mgr=this;var r=Roo.bootstrap.layout;Roo.log(C); switch(C){case "north":return new r.North(A);case "south":return new r.South(A);case "east":return new r.East(A);case "west":return new r.West(A);case "center":return new r.Center(A);}throw 'Layout region "'+C+'" not supported.';}}); -- 2.39.2