From: Alan Knowles <alan@roojs.com>
Date: Thu, 24 Jan 2019 07:54:23 +0000 (+0800)
Subject: roojs-bootstrap.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=27c3d323cc50af7d42a4bfbb7364855effe76035

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

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index d0b7c7eb0d..f35fd2fb65 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -4069,15 +4069,8 @@ Roo.extend(Roo.bootstrap.NavSimplebar, Roo.bootstrap.Navbar,  {
 	
 	// i'm not actually sure these are really used - normally we add a navGroup to a navbar
 	
-	if (Roo.bootstrap.version == 4) {
-	    cfg.cn = [
-		{
-		    cls: 'nav',
-		    tag : 'ul'
-		}
-	    ];
-        
-	     return cfg;
+	if (Roo.bootstrap.version == 4 && this.xtype == 'NavSimpleBar') {
+	    return cfg;
 	}
 	
 	
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index d147b1c3d0..10c4a73072 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -161,7 +161,7 @@ ce.addClass('show');ce.removeClass('collapse');ce.dom.style.height='';},this,{si
 }ce.removeClass('in');ce.setHeight(ce.getHeight());ce.removeClass('show');ce.addClass('collapsing');ce.on('transitionend',function(){ce.dom.style.height='';ce.removeClass('collapsing');ce.addClass('collapse');},this,{single:true});ce.setHeight(0);}});
 // Roo/bootstrap/NavSimplebar.js
 Roo.bootstrap.NavSimplebar=function(A){Roo.bootstrap.NavSimplebar.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.NavSimplebar,Roo.bootstrap.Navbar,{inverse:false,type:false,arrangement:'',align:false,weight:'light',main:false,tag:false,getAutoCreate:function(){var A={tag:this.tag||'div',cls:'navbar navbar-expand-lg roo-navbar-simple'}
-;if(['light','white'].indexOf(this.weight)>-1){A.cls+=['light','white'].indexOf(this.weight)>-1?' navbar-light':' navbar-dark';}A.cls+=' bg-'+this.weight;if(this.inverse){A.cls+=' navbar-inverse';}if(Roo.bootstrap.version==4){A.cn=[{cls:'nav',tag:'ul'}];return A;
+;if(['light','white'].indexOf(this.weight)>-1){A.cls+=['light','white'].indexOf(this.weight)>-1?' navbar-light':' navbar-dark';}A.cls+=' bg-'+this.weight;if(this.inverse){A.cls+=' navbar-inverse';}if(Roo.bootstrap.version==4&&this.xtype=='NavSimpleBar'){return A;
 }A.cn=[{cls:'nav',tag:'ul'}];this.type=this.type||'nav';if(['tabs','pills'].indexOf(this.type)!=-1){A.cn[0].cls+=' nav-'+this.type}else{if(this.type!=='nav'){Roo.log('nav type must be nav/tabs/pills')}A.cn[0].cls+=' navbar-nav'}if(['stacked','justified'].indexOf(this.arrangement)!=-1){A.cn[0].cls+=' nav-'+this.arrangement;
 }if(this.align==='right'){A.cn[0].cls+=' navbar-right';}return A;}});
 // Roo/bootstrap/NavHeaderbar.js