Roo/bootstrap/form/TimeField.js

[roojs1] / Roo / bootstrap / form / TimeField.js

diff --git a/Roo/bootstrap/form/TimeField.js b/Roo/bootstrap/form/TimeField.js
index 9a8d122..af0effe 100644 (file)
--- a/Roo/bootstrap/form/TimeField.js
+++ b/Roo/bootstrap/form/TimeField.js
@@ -9,7 +9,7 @@
  * @class Roo.bootstrap.form.TimeField
  * @extends Roo.bootstrap.form.Input
  * Bootstrap DateField class
- * @cfg {Number} minuteStep the minutes goes up/down by a fixed number, default 1
+ * @cfg {Number} minuteStep the minutes is always the multiple of a fixed number, default 1
  * 
  * 
  * @constructor
@@ -281,6 +281,14 @@ Roo.extend(Roo.bootstrap.form.TimeField, Roo.bootstrap.form.Input,  {
     update: function()
     {
         
+        if(typeof(this.time) === 'undefined') {
+            var now = new Date();
+            Roo.log('NOW');
+            Roo.log(now.format('i'));
+            Roo.log('NEW');
+            var newMinute = Math.round(parseInt(now.format('i')) / this.minuteStep) * this.minuteStep;
+            Roo.log(newMinute);
+        }
         this.time = (typeof(this.time) === 'undefined') ? new Date() : this.time;
         
         this.fill();
@@ -433,14 +441,16 @@ Roo.extend(Roo.bootstrap.form.TimeField, Roo.bootstrap.form.Input,  {
     onIncrementMinutes: function()
     {
         Roo.log('onIncrementMinutes');
-        this.time = this.time.add(Date.MINUTE, this.minuteStep);
+        var minutesToAdd = Math.round((parseInt(this.time.format('i')) + this.minuteStep) / this.minuteStep) * this.minuteStep - parseInt(this.time.format('i'));
+        this.time = this.time.add(Date.MINUTE, minutesToAdd);
         this.update();
     },
     
     onDecrementMinutes: function()
     {
         Roo.log('onDecrementMinutes');
-        this.time = this.time.add(Date.MINUTE, -1 * this.minuteStep);
+        var minutesToSubtract = parseInt(this.time.format('i')) - Math.round((parseInt(this.time.format('i')) - this.minuteStep) / this.minuteStep) * this.minuteStep;
+        this.time = this.time.add(Date.MINUTE, -1 * minutesToSubtract);
         this.update();
     },