From 0b8c54828c5ccbf2e82dad6c83c6c4fcee8629dd Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 21 Feb 2019 15:32:26 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js roojs-calendar.js roojs-calendar-debug.js --- roojs-bootstrap-debug.js | 8 ++++---- roojs-bootstrap.js | 4 ++-- roojs-calendar-debug.js | 8 ++++---- roojs-calendar.js | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index a7060f369e..8043796e2f 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -398,13 +398,13 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, { addxtypeChildren: function(child_array) { var nitems = []; - if (!tree.items || !tree.items.length) { + if (!child_array || !child_array.length) { this.items = nitems; - //Roo.log(["no children", this]); - - return cn; + return this; } + + }, diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index aa29f99e20..d78b33e4b8 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -12,8 +12,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){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)); 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*[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