From 3d14b3f8a260462e14173673f27983de45f045bc Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 29 Dec 2022 11:16:25 +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 | 4 +++- roojs-bootstrap.js | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Roo/bootstrap/form/TimeField.js b/Roo/bootstrap/form/TimeField.js index 7a14f33b9b..6ca57e657e 100644 --- a/Roo/bootstrap/form/TimeField.js +++ b/Roo/bootstrap/form/TimeField.js @@ -447,7 +447,9 @@ 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); + 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 minutesToSubtract = 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, -1 * this.minuteStep); this.update(); }, diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 7b20323746..fbbaf432bc 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -24411,7 +24411,9 @@ 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); + 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 minutesToSubtract = 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, -1 * this.minuteStep); this.update(); }, diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 9b92627c19..5673b81823 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1033,8 +1033,9 @@ this.hide();},show:function(){this.picker().show();this.pop.show();this.update() 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)/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'} +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)/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,-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); -- 2.39.2