From 06941a283d9924987c36e0e40a91e4d41bf684a0 Mon Sep 17 00:00:00 2001 From: edward Date: Thu, 24 May 2018 13:22:54 +0800 Subject: [PATCH] Roo/bootstrap/Component.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/Component.js | 1 + roojs-bootstrap-debug.js | 1 + roojs-bootstrap.js | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Roo/bootstrap/Component.js b/Roo/bootstrap/Component.js index 2d550e0211..ba0138aa98 100644 --- a/Roo/bootstrap/Component.js +++ b/Roo/bootstrap/Component.js @@ -247,6 +247,7 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, { // render the element if it's not BODY. if (!is_body) { + Roo.log(this[cntr](true)); // if parent was disabled, then do not try and create the children.. if(this[cntr](true) === false || this[cntr](true) === null){ tree.items = []; diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index f8dfdeb6af..1caaa95d77 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -247,6 +247,7 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, { // render the element if it's not BODY. if (!is_body) { + Roo.log(this[cntr](true)); // if parent was disabled, then do not try and create the children.. if(this[cntr](true) === false || this[cntr](true) === null){ tree.items = []; diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index e9d0838d3e..58459b4d47 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -7,8 +7,8 @@ this.el.dom.removeAttribute('xtype');this.initEvents();}return;}var B=Roo.apply( }var C=(typeof(A['flexy:foreach'])!='undefined');var D=(typeof(A['flexy:if'])!='undefined');var E=Roo.XComponent.build_from_html;var F=(A.xtype=='Body');var G=(Roo.get(document.body).attr('xtype')=='Roo.bootstrap.Body');var H=Roo.get(this[B](false));if((C||D||this.can_build_overlaid==false)&&E){return false; }if(!C||!E||F||!G){if(!D||typeof(A.name)=='undefined'||!E||F||!G){return this.addxtypeChild(A,B,F);}var I=H?H.child('>*[name='+A.name+']'):false;if(I){return this.addxtypeChild(Roo.apply({},A),B);}Roo.log('skipping render');return cn;}var J=false;if(!E){return false; }while(true){var I=H?H.child('>*[xtype]'):false;if(!I){break;}if(I&&I.attr('xtype').split('.').pop()!=cn.xtype){break;}J=this.addxtypeChild(Roo.apply({},A),B);}return J;},addxtypeChild:function(A,B,C){Roo.debug&&Roo.log('addxtypeChild:'+B);var cn=this;B=(typeof(B)=='undefined')?'getChildContainer':B; -var D=(typeof(A['flexy:if'])!='undefined')||(typeof(A['flexy:foreach'])!='undefined');skip_children=false;if(!C){if(this[B](true)===false||this[B](true)===null){A.items=[];return A;}cn=Roo.factory(A);cn.parentType=this.xtype;cn.parentId=this.id;var E=Roo.XComponent.build_from_html; -if(E&&Roo.get(document.body).attr('xtype')=='Roo.bootstrap.Body'){var F=Roo.get(this[B](false));var G=F?F.child('>*[xtype]'):false;if(G){}if(G&&G.attr('xtype').split('.').pop()==cn.xtype){cn.el=G;}else{Roo.debug&&Roo.log("MISSING "+cn.xtype+" on child of "+(this.el?this.el.attr('xbuilderid'):'no parent')); +var D=(typeof(A['flexy:if'])!='undefined')||(typeof(A['flexy:foreach'])!='undefined');skip_children=false;if(!C){Roo.log(this[B](true));if(this[B](true)===false||this[B](true)===null){A.items=[];return A;}cn=Roo.factory(A);cn.parentType=this.xtype;cn.parentId=this.id; +var E=Roo.XComponent.build_from_html;if(E&&Roo.get(document.body).attr('xtype')=='Roo.bootstrap.Body'){var F=Roo.get(this[B](false));var G=F?F.child('>*[xtype]'):false;if(G){}if(G&&G.attr('xtype').split('.').pop()==cn.xtype){cn.el=G;}else{Roo.debug&&Roo.log("MISSING "+cn.xtype+" on child of "+(this.el?this.el.attr('xbuilderid'):'no parent')); Roo.debug&&Roo.log(F);Roo.debug&&Roo.log(G);Roo.debug&&Roo.log(cn);}}if(E&&D&&!cn.el&&cn.can_build_overlaid){Roo.debug&&Roo.log('skipping render');Roo.debug&&Roo.log(A);if(!cn.el){Roo.debug&&Roo.log('skipping all children');skip_children=true;}}else{cn.render&&cn.render(this[B](true)); }}var H=[];if(!A.items||!A.items.length){cn.items=H;return cn;}var I=A.items;delete A.items;if(!skip_children){for(var i=0;i