From fd460b9f6b4b54de918c267515f5f704f8b9ccea Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 30 Nov 2018 13:44:06 +0800
Subject: [PATCH] Roo/bootstrap/NavSimplebar.js roojs-bootstrap.js
 roojs-bootstrap-debug.js

---
 Roo/bootstrap/NavSimplebar.js | 16 +++++++++++-----
 roojs-bootstrap-debug.js      | 16 +++++++++++-----
 roojs-bootstrap.js            |  6 +++---
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Roo/bootstrap/NavSimplebar.js b/Roo/bootstrap/NavSimplebar.js
index 3459857cdc..c7f8ca53a2 100644
--- a/Roo/bootstrap/NavSimplebar.js
+++ b/Roo/bootstrap/NavSimplebar.js
@@ -62,7 +62,16 @@ Roo.extend(Roo.bootstrap.NavSimplebar, Roo.bootstrap.Navbar,  {
 	}
 	cfg.cls += ' bg-' + this.weight;
 	
-	  
+	if (this.inverse) {
+            cfg.cls += ' navbar-inverse';
+            
+        }
+	
+	// i'm not actually sure these are really used - normally we add a navGroup to a navbar
+	
+	if (Roo.bootstrap.version == 4) {
+	    return cfg;
+	}
 	
         cfg.cn = [
             {
@@ -96,10 +105,7 @@ Roo.extend(Roo.bootstrap.NavSimplebar, Roo.bootstrap.Navbar,  {
             cfg.cn[0].cls += ' navbar-right';
         }
         
-        if (this.inverse) {
-            cfg.cls += ' navbar-inverse';
-            
-        }
+        
         
         
         return cfg;
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 8275ccf566..990798140e 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -4023,7 +4023,16 @@ Roo.extend(Roo.bootstrap.NavSimplebar, Roo.bootstrap.Navbar,  {
 	}
 	cfg.cls += ' bg-' + this.weight;
 	
-	  
+	if (this.inverse) {
+            cfg.cls += ' navbar-inverse';
+            
+        }
+	
+	// i'm not actually sure these are really used - normally we add a navGroup to a navbar
+	
+	if (Roo.bootstrap.version == 4) {
+	    return cfg;
+	}
 	
         cfg.cn = [
             {
@@ -4057,10 +4066,7 @@ Roo.extend(Roo.bootstrap.NavSimplebar, Roo.bootstrap.Navbar,  {
             cfg.cn[0].cls += ' navbar-right';
         }
         
-        if (this.inverse) {
-            cfg.cls += ' navbar-inverse';
-            
-        }
+        
         
         
         return cfg;
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index d412c03ebb..99075357c5 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -159,9 +159,9 @@ ce.addClass('show');var h=ce.getHeight();Roo.log(h);ce.removeClass('show');ce.ad
 }return this.el;},mask:function(){this.maskEl.show();},unmask:function(){this.maskEl.hide();}});
 // 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'}
-;if(['light','white'].indexOf(this.weight)>-1){A.cls+=['light','white'].indexOf(this.weight)>-1?' navbar-light':' navbar-dark';}A.cls+=' bg-'+this.weight;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';}if(this.inverse){A.cls+=' navbar-inverse';
-}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){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
 Roo.bootstrap.NavHeaderbar=function(A){Roo.bootstrap.NavHeaderbar.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.NavHeaderbar,Roo.bootstrap.NavSimplebar,{position:'',brand:'',brand_href:false,srButton:true,autohide:false,desktopCenter:false,getAutoCreate:function(){var A={tag:this.nav||'nav',cls:'navbar navbar-expand-md',role:'navigation',cn:[]}
 ;var cn=A.cn;if(this.desktopCenter){cn.push({cls:'container',cn:[]});cn=cn[0].cn;}if(this.srButton){var B={tag:'button',type:'button',cls:'navbar-toggle navbar-toggler','data-toggle':'collapse',cn:[{tag:'span',cls:'sr-only',html:'Toggle navigation'},{tag:'span',cls:'icon-bar navbar-toggler-icon'}
-- 
2.39.2