buildSDK/dependancy_bootstrap.txt

[roojs1] / Roo / bootstrap / DateSplitField.js

diff --git a/Roo/bootstrap/DateSplitField.js b/Roo/bootstrap/DateSplitField.js
index cfff232..421a119 100644 (file)
--- a/Roo/bootstrap/DateSplitField.js
+++ b/Roo/bootstrap/DateSplitField.js
@@ -135,28 +135,30 @@ Roo.extend(Roo.bootstrap.DateSplitField, Roo.bootstrap.Component,  {
                 }
 
                 if(this.labelmd > 0){
-                    labelCfg.cls += ' col-md-' + this.labelmd;
-                    contentCfg.cls += ' col-md-' + (12 - this.labelmd);
+                    labelCls = ' col-md-' + this.labelmd;
+                    contentCls = ' col-md-' + ((12 - this.labelmd) / 3);
                 }
 
                 if(this.labelsm > 0){
-                    labelCfg.cls += ' col-sm-' + this.labelsm;
-                    contentCfg.cls += ' col-sm-' + (12 - this.labelsm);
+                    labelCls = ' col-sm-' + this.labelsm;
+                    contentCls = ' col-sm-' + ((12 - this.labelsm) / 3);
                 }
 
                 if(this.labelxs > 0){
-                    labelCfg.cls += ' col-xs-' + this.labelxs;
-                    contentCfg.cls += ' col-xs-' + (12 - this.labelxs);
+                    labelCls = ' col-xs-' + this.labelxs;
+                    contentCls = ' col-xs-' + ((12 - this.labelxs) / 3);
                 }
             }
             
+            label.cls += ' ' + labelCls;
+            
             cfg.cn.push(label);
         }
         
         Roo.each(['day', 'month', 'year'], function(t){
             cfg.cn.push({
                 tag : 'div',
-                cls : 'column roo-date-split-field-' + t + ' col-md-' + ((this.labelAlign == 'top') ? '4' : ((12 - this.labelWidth) / 3))
+                cls : 'column roo-date-split-field-' + t + ' ' + contentCls
             });
         }, this);
         
@@ -172,7 +174,7 @@ Roo.extend(Roo.bootstrap.DateSplitField, Roo.bootstrap.Component,  {
     {
         var _this = this;
         
-        Roo.bootstrap.NavProgressBar.superclass.onRender.call(this, ct, position);
+        Roo.bootstrap.DateSplitFiel.superclass.onRender.call(this, ct, position);
         
         this.inputEl = this.el.select('.roo-date-split-field-group-value', true).first();