Roo/bootstrap/ComboBox.js
authorjohn <john@roojs.com>
Tue, 20 Feb 2018 03:55:08 +0000 (11:55 +0800)
committerjohn <john@roojs.com>
Tue, 20 Feb 2018 03:55:08 +0000 (11:55 +0800)
Roo/bootstrap/ComboBox.js

index bff67bd..548b925 100644 (file)
@@ -2343,20 +2343,21 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
             
             var labelCfg = cfg.cn[1];
             var contentCfg = cfg.cn[2];
+            
 
             if(this.indicatorpos == 'right'){
-    
                 cfg.cn = [
                     {
                         tag: 'label',
                         cls : 'control-label',
-                        html : this.fieldLabel
-
-                    },
-                    {
-                       tag : 'i',
-                       cls : 'roo-required-indicator right-indicator text-danger fa fa-lg fa-star',
-                       tooltip : 'This field is required'
+                        html : this.fieldLabel,
+                        cn : [
+                            {
+                               tag : 'i',
+                               cls : 'roo-required-indicator right-indicator text-danger fa fa-lg fa-star',
+                               tooltip : 'This field is required'
+                            }
+                        ]
                     },
                     {
                         cls : '', 
@@ -2366,7 +2367,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
                     }
                 ];
                 labelCfg = cfg.cn[0];
-                contentCfg = cfg.cn[2];
+                contentCfg = cfg.cn[1];
             }