Roo/bootstrap/Navbar.Item.js

diff --git a/Roo/bootstrap/Navbar.Item.js b/Roo/bootstrap/Navbar.Item.js
index bb6dd70..1a4d8bb 100644 (file)
--- a/Roo/bootstrap/Navbar.Item.js
+++ b/Roo/bootstrap/Navbar.Item.js
@@ -27,6 +27,16 @@ Roo.extend(Roo.bootstrap.Navbar.Item, Roo.bootstrap.Component,  {
                html: 'Text'
             }
         ];
+        
+        if (this.glyphicon) {
+            if(cfg.html){cfg.html = ' ' + this.html};
+            cfg.cn=[
+                {
+                    tag: 'span',
+                    cls: 'glyphicon glyphicon-' + this.glyphicon
+                }
+            ];
+        }
        
         cfg.cn[0].html = this.html || cfg.cn[0].html ;
        if (this.menu) {
@@ -41,16 +51,6 @@ Roo.extend(Roo.bootstrap.Navbar.Item, Roo.bootstrap.Component,  {
            cfg.cn[0].href=this.href||'#';
            cfg.cn[0].html=this.html;
        }
-        
-        if (this.glyphicon) {
-            if(cfg.html){cfg.html = ' ' + this.html};
-            cfg.cn=[
-                {
-                    tag: 'span',
-                    cls: 'glyphicon glyphicon-' + this.glyphicon
-                }
-            ];
-        }
        
        if (this.badge !== '') {