Roo/bootstrap/form/TimeField.js

roojs-bootstrap.js
roojs-bootstrap-debug.js

diff --git a/Roo/bootstrap/form/TimeField.js b/Roo/bootstrap/form/TimeField.js
index 90f09fd..327e82e 100644 (file)
--- a/Roo/bootstrap/form/TimeField.js
+++ b/Roo/bootstrap/form/TimeField.js
@@ -435,7 +435,7 @@ Roo.extend(Roo.bootstrap.form.TimeField, Roo.bootstrap.form.Input,  {
         Roo.log('onIncrementMinutes');
         Roo.log(this.time);
         Roo.log(this.time.format('i'));
-        Roo.logMath.round((parseInt(this.time.format('i')) + this.minuteStep) / 5) * 5;
+        Roo.log(Math.round((parseInt(this.time.format('i')) + this.minuteStep) / 5) * 5);
         this.time = this.time.add(Date.MINUTE, this.minuteStep);
         this.update();
     },
@@ -445,6 +445,7 @@ Roo.extend(Roo.bootstrap.form.TimeField, Roo.bootstrap.form.Input,  {
         Roo.log('onDecrementMinutes');
         Roo.log(this.time);
         Roo.log(this.time.format('i'));
+        Roo.log(Math.round((parseInt(this.time.format('i')) - this.minuteStep) / 5) * 5);
         this.time = this.time.add(Date.MINUTE, -1 * this.minuteStep);
         this.update();
     },

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 112776b..f43174f 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -24399,6 +24399,7 @@ Roo.extend(Roo.bootstrap.form.TimeField, Roo.bootstrap.form.Input,  {
         Roo.log('onIncrementMinutes');
         Roo.log(this.time);
         Roo.log(this.time.format('i'));
+        Roo.log(Math.round((parseInt(this.time.format('i')) + this.minuteStep) / 5) * 5);
         this.time = this.time.add(Date.MINUTE, this.minuteStep);
         this.update();
     },
@@ -24408,6 +24409,7 @@ Roo.extend(Roo.bootstrap.form.TimeField, Roo.bootstrap.form.Input,  {
         Roo.log('onDecrementMinutes');
         Roo.log(this.time);
         Roo.log(this.time.format('i'));
+        Roo.log(Math.round((parseInt(this.time.format('i')) - this.minuteStep) / 5) * 5);
         this.time = this.time.add(Date.MINUTE, -1 * this.minuteStep);
         this.update();
     },

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index d453996..e98bca7 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1031,10 +1031,10 @@ A.push('top');}A.push('right');if((Roo.lib.Dom.getViewWidth()+Roo.get(document.b
 ).defer(200);B.picker().alignTo(B.inputEl(),"tr-br",[0,10],false);return;}if(c=='top'){B.picker().alignTo(B.inputEl(),"br-tr",[0,10],false);return;}});},onFocus:function(){Roo.bootstrap.form.TimeField.superclass.onFocus.call(this);this.show();},onBlur:function(){Roo.bootstrap.form.TimeField.superclass.onBlur.call(this);
 this.hide();},show:function(){this.picker().show();this.pop.show();this.update();this.place();this.fireEvent('show',this,this.date);},hide:function(){this.picker().hide();this.pop.hide();this.fireEvent('hide',this,this.date);},setTime:function(){this.hide();
 this.setValue(this.time.format(this.format));this.fireEvent('select',this,this.date);},onMousedown:function(e){e.stopPropagation();e.preventDefault();},onIncrementHours:function(){Roo.log('onIncrementHours');this.time=this.time.add(Date.HOUR,1);this.update();
-},onDecrementHours:function(){Roo.log('onDecrementHours');this.time=this.time.add(Date.HOUR,-1);this.update();},onIncrementMinutes:function(){Roo.log('onIncrementMinutes');Roo.log(this.time);Roo.log(this.time.format('i'));this.time=this.time.add(Date.MINUTE,this.minuteStep);
-this.update();},onDecrementMinutes:function(){Roo.log('onDecrementMinutes');Roo.log(this.time);Roo.log(this.time.format('i'));this.time=this.time.add(Date.MINUTE,-1*this.minuteStep);this.update();},onTogglePeriod:function(){Roo.log('onTogglePeriod');this.time=this.time.add(Date.HOUR,12);
-this.update();}});Roo.apply(Roo.bootstrap.form.TimeField,{template:{tag:'div',cls:'datepicker dropdown-menu',cn:[{tag:'div',cls:'datepicker-time',cn:[{tag:'table',cls:'table-condensed',cn:[{tag:'tbody',cn:[{tag:'tr',cn:[{tag:'td',colspan:'7'}]}]},{tag:'tfoot',cn:[{tag:'tr',cn:[{tag:'th',colspan:'7',cls:'',cn:[{tag:'button',cls:'btn btn-info ok',html:'OK'}
-]}]}]}]}]}]}});
+},onDecrementHours:function(){Roo.log('onDecrementHours');this.time=this.time.add(Date.HOUR,-1);this.update();},onIncrementMinutes:function(){Roo.log('onIncrementMinutes');Roo.log(this.time);Roo.log(this.time.format('i'));Roo.log(Math.round((parseInt(this.time.format('i'))+this.minuteStep)/5)*5);
+this.time=this.time.add(Date.MINUTE,this.minuteStep);this.update();},onDecrementMinutes:function(){Roo.log('onDecrementMinutes');Roo.log(this.time);Roo.log(this.time.format('i'));Roo.log(Math.round((parseInt(this.time.format('i'))-this.minuteStep)/5)*5);this.time=this.time.add(Date.MINUTE,-1*this.minuteStep);
+this.update();},onTogglePeriod:function(){Roo.log('onTogglePeriod');this.time=this.time.add(Date.HOUR,12);this.update();}});Roo.apply(Roo.bootstrap.form.TimeField,{template:{tag:'div',cls:'datepicker dropdown-menu',cn:[{tag:'div',cls:'datepicker-time',cn:[{tag:'table',cls:'table-condensed',cn:[{tag:'tbody',cn:[{tag:'tr',cn:[{tag:'td',colspan:'7'}
+]}]},{tag:'tfoot',cn:[{tag:'tr',cn:[{tag:'th',colspan:'7',cls:'',cn:[{tag:'button',cls:'btn btn-info ok',html:'OK'}]}]}]}]}]}]}});
 // Roo/bootstrap/form/MonthField.js
 Roo.bootstrap.form.MonthField=function(A){Roo.bootstrap.form.MonthField.superclass.constructor.call(this,A);this.addEvents({show:true,hide:true,select:true});};Roo.extend(Roo.bootstrap.form.MonthField,Roo.bootstrap.form.Input,{onRender:function(ct,A){Roo.bootstrap.form.MonthField.superclass.onRender.call(this,ct,A);
 this.language=this.language||'en';this.language=this.language in Roo.bootstrap.form.MonthField.dates?this.language:this.language.split('-')[0];this.language=this.language in Roo.bootstrap.form.MonthField.dates?this.language:"en";this.isRTL=Roo.bootstrap.form.MonthField.dates[this.language].rtl||false;