allow string based values for comboboxarray

[roojs1] / Roo / bootstrap / NavProgressBar.js

diff --git a/Roo/bootstrap/NavProgressBar.js b/Roo/bootstrap/NavProgressBar.js
index 2a49b41..7afa07c 100644 (file)
--- a/Roo/bootstrap/NavProgressBar.js
+++ b/Roo/bootstrap/NavProgressBar.js
@@ -103,29 +103,30 @@ Roo.extend(Roo.bootstrap.NavProgressBar, Roo.bootstrap.Component,  {
         if(cfg.html){
             var top = new Roo.bootstrap.Element({
                 tag : 'div',
-                cls : 'roo-navigation-bar-text',
-                cn : [
-                    {
-                        tag : 'span',
-                        html : (typeof(cfg.position) != 'undefined' && cfg.position == 'top') ? cfg.html : ''
-                    }
-                ]
+                cls : 'roo-navigation-bar-text'
             });
             
             var bottom = new Roo.bootstrap.Element({
                 tag : 'div',
-                cls : 'roo-navigation-bar-text',
-                cn : [
-                    {
-                        tag : 'span',
-                        html : (typeof(cfg.position) != 'undefined' && cfg.position == 'top') ? '' : cfg.html
-                    }
-                ]
+                cls : 'roo-navigation-bar-text'
             });
             
             top.onRender(this.el.select('.roo-navigation-top-bar', true).first(), null);
             bottom.onRender(this.el.select('.roo-navigation-bottom-bar', true).first(), null);
             
+            var topText = new Roo.bootstrap.Element({
+                tag : 'span',
+                html : (typeof(cfg.position) != 'undefined' && cfg.position == 'top') ? cfg.html : ''
+            });
+            
+            var bottomText = new Roo.bootstrap.Element({
+                tag : 'span',
+                html : (typeof(cfg.position) != 'undefined' && cfg.position == 'top') ? '' : cfg.html
+            });
+            
+            topText.onRender(top.el, null);
+            bottomText.onRender(bottom.el, null);
+            
             item.topEl = top;
             item.bottomEl = bottom;
         }