From: edward Date: Thu, 17 May 2018 07:27:21 +0000 (+0800) Subject: Roo/bootstrap/Component.js X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=c2b6e0dd59021f8b3b8a66c58bcb86b96ee127d5;p=roojs1 Roo/bootstrap/Component.js roojs-bootstrap.js roojs-bootstrap-debug.js --- diff --git a/Roo/bootstrap/Component.js b/Roo/bootstrap/Component.js index e4edb64c7d..6481780647 100644 --- a/Roo/bootstrap/Component.js +++ b/Roo/bootstrap/Component.js @@ -313,6 +313,7 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, { Roo.log(this[cntr](true)); if(this[cntr](true) === false){ + Roo.log(['skip', cn]); return; } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 152af544b6..d885eef60f 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -313,6 +313,7 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, { Roo.log(this[cntr](true)); if(this[cntr](true) === false){ + Roo.log(['skip', cn]); return; } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 805f6fcd3d..cc51368c26 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -10,8 +10,8 @@ this.el.dom.removeAttribute('xtype');this.initEvents();}return;}var B=Roo.apply( var D=(typeof(A['flexy:if'])!='undefined')||(typeof(A['flexy:foreach'])!='undefined');skip_children=false;if(!C){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{Roo.log('start render...');Roo.log(cn);Roo.log(this[B](true)); -if(this[B](true)===false){return;}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