From 50efe33d2598c5b171df10a04cd887791ae84460 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 22 Mar 2023 13:39:01 +0800 Subject: [PATCH] Roo/bootstrap/Component.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/Component.js | 2 ++ roojs-bootstrap-debug.js | 2 ++ roojs-bootstrap.js | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Roo/bootstrap/Component.js b/Roo/bootstrap/Component.js index fb3c1895ed..3627e997df 100644 --- a/Roo/bootstrap/Component.js +++ b/Roo/bootstrap/Component.js @@ -264,6 +264,8 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, { } cn = Roo.factory(tree); + + Roo.log(cn); cn.parentType = this.xtype; //?? cn.parentId = this.id; diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index e42ee0d559..43d3f4b609 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -484,6 +484,8 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, { } cn = Roo.factory(tree); + + Roo.log(cn); cn.parentType = this.xtype; //?? cn.parentId = this.id; diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 301b75cbb4..cfb45aaa7b 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -35,7 +35,7 @@ cn=Roo.factory(A);cn.parentType=this.xtype;cn.parentId=this.id;B=(typeof(B)=='un 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);Roo.log('ADDXTYPECHILD');Roo.log(A);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)){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)); +skip_children=false;if(!C){if(!this[B](true)){A.items=[];return A;}cn=Roo.factory(A);Roo.log(cn);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