Roo/bootstrap/ComboBox.js

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index bb5f5f0..032c30f 100644 (file)
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -494,18 +494,17 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
             cfg.cls += ' roo-form-group-label-left';
             
             cfg.cn = [
+                {
+                    tag : 'i',
+                    cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star',
+                    tooltip : 'This field is required'
+                },
                 {
                     tag: 'label',
                     'for' :  id,
                     cls : 'control-label',
                     html : this.fieldLabel
-                    cn: [
-                        {
-                            tag : 'i',
-                            cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star',
-                            tooltip : 'This field is required'
-                        }
-                    ]
+
                 },
                 {
                     cls : "", 
@@ -528,13 +527,12 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
                         'for' :  id,
                         cls : 'control-label',
                         html : this.fieldLabel
-                        cn: [
-                            {
-                                tag : 'i',
-                                cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star',
-                                tooltip : 'This field is required'
-                            }
-                        ]
+
+                    },
+                    {
+                        tag : 'i',
+                        cls : 'roo-required-indicator right-indicator text-danger fa fa-lg fa-star',
+                        tooltip : 'This field is required'
                     },
                     {
                         cls : "",
@@ -582,17 +580,15 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
         } else if ( this.fieldLabel.length) {
 //                Roo.log(" label");
                  cfg.cn = [
+                    {
+                        tag : 'i',
+                        cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star',
+                        tooltip : 'This field is required'
+                    },
                     {
                         tag: 'label',
                         //cls : 'input-group-addon',
                         html : this.fieldLabel
-                        cn: [
-                            {
-                                tag : 'i',
-                                cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star',
-                                tooltip : 'This field is required'
-                            }
-                        ]
                         
                     },
                     
@@ -607,14 +603,14 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
                             tag: 'label',
                             //cls : 'input-group-addon',
                             html : this.fieldLabel
-                            cn: [
-                                {
-                                    tag : 'i',
-                                    cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star',
-                                    tooltip : 'This field is required'
-                                }
-                            ]
-                        }
+
+                        },
+                        
+                        {
+                            tag : 'i',
+                            cls : 'roo-required-indicator right-indicator text-danger fa fa-lg fa-star',
+                            tooltip : 'This field is required'
+                        },
                         
                         combobox
 
@@ -2329,18 +2325,16 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
         if (align ==='left' && this.fieldLabel.length) {
 
             cfg.cn = [
-                
+                {
+                   tag : 'i',
+                   cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star',
+                   tooltip : 'This field is required'
+                },
                 {
                     tag: 'label',
                     cls : 'control-label',
                     html : this.fieldLabel
-                    cn : [
-                        {
-                           tag : 'i',
-                           cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star',
-                           tooltip : 'This field is required'
-                        }
-                    ]
+
                 },
                 {
                     cls : '',