From: Alan Knowles <alan@roojs.com>
Date: Thu, 21 Feb 2019 07:34:32 +0000 (+0800)
Subject: roojs-bootstrap.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=6213dcd578048a70a83ae79f0abcd12d4dedde0f

roojs-bootstrap.js
roojs-bootstrap-debug.js
roojs-calendar.js
roojs-calendar-debug.js
---

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index b1385bf7f7..132095627d 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -398,12 +398,16 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent,  {
     addxtypeChildren: function(child_array, skip_children)
     {
 	var nitems = [];
-	if (!child_array || !child_array.length) {
+	if (!child_array || !child_array.length ) {
             this.items = nitems;
             return;
         }
+	
 	for(var i =0;i < child_array.length;i++) {
-	//  Roo.log(['add child', items[i]]);
+	    if (skip_children) {
+		break;
+	    }
+	    //  Roo.log(['add child', items[i]]);
 	    nitems.push(this.addxtype(Roo.apply({}, child_array[i])));
 	}
 	this.items = nitems;
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 6c8c26d633..0f54658aeb 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -13,7 +13,7 @@ var D=(typeof(A['flexy:if'])!='undefined')||(typeof(A['flexy:foreach'])!='undefi
 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<I.length;i++){H.push(cn.addxtype(Roo.apply({},I[i])));}}cn.items=H;cn.fireEvent('childrenrendered',this);return cn;},addxtypeChildren:function(A,B){var C=[];if(!A||!A.length){this.items=C;
-return;}for(var i=0;i<A.length;i++){C.push(this.addxtype(Roo.apply({},A[i])));}this.items=C;this.fireEvent('childrenrendered',this);},setVisibilityEl:function(el){this.visibilityEl=el;},getVisibilityEl:function(){if(typeof(this.visibilityEl)=='object'){return this.visibilityEl;
+return;}for(var i=0;i<A.length;i++){if(B){break;}C.push(this.addxtype(Roo.apply({},A[i])));}this.items=C;this.fireEvent('childrenrendered',this);},setVisibilityEl:function(el){this.visibilityEl=el;},getVisibilityEl:function(){if(typeof(this.visibilityEl)=='object'){return this.visibilityEl;
 }if(typeof(this.visibilityEl)=='string'){return this.visibilityEl=='parent'?this.parent().getEl():this.getEl();}return this.getEl();},show:function(){if(!this.getVisibilityEl()){return;}this.getVisibilityEl().removeClass(['hidden','d-none']);this.fireEvent('show',this);
 },hide:function(){if(!this.getVisibilityEl()){return;}this.getVisibilityEl().addClass(['hidden','d-none']);this.fireEvent('hide',this);}});
 // Roo/bootstrap/Body.js
diff --git a/roojs-calendar-debug.js b/roojs-calendar-debug.js
index 2d01c5a6a0..3873880871 100644
--- a/roojs-calendar-debug.js
+++ b/roojs-calendar-debug.js
@@ -384,12 +384,16 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent,  {
     addxtypeChildren: function(child_array, skip_children)
     {
 	var nitems = [];
-	if (!child_array || !child_array.length) {
+	if (!child_array || !child_array.length ) {
             this.items = nitems;
             return;
         }
+	
 	for(var i =0;i < child_array.length;i++) {
-	//  Roo.log(['add child', items[i]]);
+	    if (skip_children) {
+		break;
+	    }
+	    //  Roo.log(['add child', items[i]]);
 	    nitems.push(this.addxtype(Roo.apply({}, child_array[i])));
 	}
 	this.items = nitems;
diff --git a/roojs-calendar.js b/roojs-calendar.js
index 7c5cd76ad0..c9ab0c5e27 100644
--- a/roojs-calendar.js
+++ b/roojs-calendar.js
@@ -11,7 +11,7 @@ var D=(typeof(A['flexy:if'])!='undefined')||(typeof(A['flexy:foreach'])!='undefi
 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<I.length;i++){H.push(cn.addxtype(Roo.apply({},I[i])));}}cn.items=H;cn.fireEvent('childrenrendered',this);return cn;},addxtypeChildren:function(A,B){var C=[];if(!A||!A.length){this.items=C;
-return;}for(var i=0;i<A.length;i++){C.push(this.addxtype(Roo.apply({},A[i])));}this.items=C;this.fireEvent('childrenrendered',this);},setVisibilityEl:function(el){this.visibilityEl=el;},getVisibilityEl:function(){if(typeof(this.visibilityEl)=='object'){return this.visibilityEl;
+return;}for(var i=0;i<A.length;i++){if(B){break;}C.push(this.addxtype(Roo.apply({},A[i])));}this.items=C;this.fireEvent('childrenrendered',this);},setVisibilityEl:function(el){this.visibilityEl=el;},getVisibilityEl:function(){if(typeof(this.visibilityEl)=='object'){return this.visibilityEl;
 }if(typeof(this.visibilityEl)=='string'){return this.visibilityEl=='parent'?this.parent().getEl():this.getEl();}return this.getEl();},show:function(){if(!this.getVisibilityEl()){return;}this.getVisibilityEl().removeClass(['hidden','d-none']);this.fireEvent('show',this);
 },hide:function(){if(!this.getVisibilityEl()){return;}this.getVisibilityEl().addClass(['hidden','d-none']);this.fireEvent('hide',this);}});
 // Roo/bootstrap/Calendar.js