From a837562ea3d09fe08f5bda6f2bf0b43dc4d6699f Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 29 Dec 2022 11:13:57 +0800 Subject: [PATCH] Roo/bootstrap/form/TimeField.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/form/TimeField.js | 4 ++-- roojs-bootstrap-debug.js | 6 ++++-- roojs-bootstrap.js | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Roo/bootstrap/form/TimeField.js b/Roo/bootstrap/form/TimeField.js index fd119084b0..7a14f33b9b 100644 --- a/Roo/bootstrap/form/TimeField.js +++ b/Roo/bootstrap/form/TimeField.js @@ -437,8 +437,8 @@ Roo.extend(Roo.bootstrap.form.TimeField, Roo.bootstrap.form.Input, { Roo.log(this.time.format('i')); Roo.log(Math.round((parseInt(this.time.format('i')) + this.minuteStep) / this.minuteStep) * this.minuteStep); Roo.log(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, 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(); }, diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index f43174fdd8..7b20323746 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -24399,8 +24399,10 @@ 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); + Roo.log(Math.round((parseInt(this.time.format('i')) + this.minuteStep) / this.minuteStep) * this.minuteStep); + Roo.log(Math.round((parseInt(this.time.format('i')) + this.minuteStep) / this.minuteStep) * this.minuteStep - parseInt(this.time.format('i'))); + 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(); }, diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index e98bca7b53..9b92627c19 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1031,8 +1031,9 @@ 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'));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); +},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)/this.minuteStep)*this.minuteStep); +Roo.log(Math.round((parseInt(this.time.format('i'))+this.minuteStep)/this.minuteStep)*this.minuteStep-parseInt(this.time.format('i')));var A=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,A);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 -- 2.39.2