Roo/bootstrap/PhoneInput.js

diff --git a/Roo/bootstrap/PhoneInput.js b/Roo/bootstrap/PhoneInput.js
index 3be88f6..a0344ab 100644 (file)
--- a/Roo/bootstrap/PhoneInput.js
+++ b/Roo/bootstrap/PhoneInput.js
@@ -104,129 +104,12 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.Input,  {
                 ];
             }
             
-            if (align ==='left' && this.fieldLabel.length) {
-                cfg.cls += ' roo-form-group-label-left';
-                indicator.cls += ' left-indicator'
-                cfg.cn = [
-                    indicator,
-                    label,
-                    container
-                ];
-                
-                var labelCfg = cfg.cn[1];
-                var contentCfg = cfg.cn[2];
-                
-                if(this.indicatorpos == 'right'){
-                    cfg.cn = [
-                        {
-                            tag: 'label',
-                            'for' :  id,
-                            cls : 'control-label',
-                            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'
-                                }
-                            ]
-                        },
-                        {
-                            cls : "", 
-                            cn: [
-                                combobox
-                            ]
-                        }
-
-                    ];
-                    
-                    labelCfg = cfg.cn[0];
-                    contentCfg = cfg.cn[1];
-                }
-                
-                if(this.labelWidth > 12){
-                    labelCfg.style = "width: " + this.labelWidth + 'px';
-                }
-                
-                if(this.labelWidth < 13 && this.labelmd == 0){
-                    this.labelmd = this.labelWidth;
-                }
-                
-                if(this.labellg > 0){
-                    labelCfg.cls += ' col-lg-' + this.labellg;
-                    contentCfg.cls += ' col-lg-' + (12 - this.labellg);
-                }
-                
-                if(this.labelmd > 0){
-                    labelCfg.cls += ' col-md-' + this.labelmd;
-                    contentCfg.cls += ' col-md-' + (12 - this.labelmd);
-                }
-                
-                if(this.labelsm > 0){
-                    labelCfg.cls += ' col-sm-' + this.labelsm;
-                    contentCfg.cls += ' col-sm-' + (12 - this.labelsm);
-                }
+            if(align == 'left' && fieldLabel) {
                 
-                if(this.labelxs > 0){
-                    labelCfg.cls += ' col-xs-' + this.labelxs;
-                    contentCfg.cls += ' col-xs-' + (12 - this.labelxs);
-                }
-                
-            } 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
-
-                   },
-
-                   combobox
-
-                ];
-                
-                if(this.indicatorpos == 'right'){
-                    
-                    cfg.cn = [
-                        {
-                           tag: 'label',
-                           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'
-                               }
-                           ]
-
-                        },
-                        combobox
-
-                    ];
-
-                }
-
-            } else {
-                
-    //                Roo.log(" no label && no align");
-                    cfg = combobox
-                         
-                    
             }
             
             var settings=this;
+            
             ['xs','sm','md','lg'].map(function(size){
                 if (settings[size]) {
                     cfg.cls += ' col-' + size + '-' + settings[size];