sync

[roojs1] / Roo / bootstrap / ComboBox.js

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index bcf30ce..a5b7622 100644 (file)
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -368,10 +368,6 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
          */
         if(!this.tickable){
             cfg = Roo.bootstrap.ComboBox.superclass.getAutoCreate.call(this);
-            if(this.name == 'info_year_invest_id_display_name'){
-                Roo.log('cfg.................................................');
-                Roo.log(cfg);
-            }
             return cfg;
         }
         
@@ -523,8 +519,6 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
 
             if(this.indicatorpos == 'right'){
                 
-                cfg.cls += ' roo-form-group-label-right';
-                
                 cfg.cn = [
                     {
                         tag: 'label',
@@ -599,38 +593,25 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
                         tag: 'label',
                         //cls : 'input-group-addon',
                         html : this.fieldLabel
-                        
                     },
-                    
                     combobox
-                    
                 ];
                 
                 if(this.indicatorpos == 'right'){
-                    
                     cfg.cn = [
                         {
                             tag: 'label',
                             //cls : 'input-group-addon',
-                            cn : [
-                                {
-                                    tag : 'span',
-                                    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
+                        },
+                        {
+                            tag : 'i',
+                            cls : 'roo-required-indicator right-indicator text-danger fa fa-lg fa-star',
+                            tooltip : 'This field is required'
                         },
-                        
-                        
-                        
                         combobox
-
                     ];
-                
+                    
                 }
 
         } else {