Merge pull request #3578 from DenizMOz/issue-3356
Calendar: allow modification of minute value on MaxDatepull/3594/head
commit
1b17013ee3
|
@ -1544,7 +1544,7 @@ export default {
|
||||||
incrementMinute(event) {
|
incrementMinute(event) {
|
||||||
let newMinute = this.currentMinute + this.stepMinute;
|
let newMinute = this.currentMinute + this.stepMinute;
|
||||||
|
|
||||||
if (this.validateTime(this.currentHour, newMinute, this.currentSecond, true)) {
|
if (this.validateTime(this.currentHour, newMinute, this.currentSecond, this.pm)) {
|
||||||
this.currentMinute = newMinute > 59 ? newMinute - 60 : newMinute;
|
this.currentMinute = newMinute > 59 ? newMinute - 60 : newMinute;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1555,7 +1555,7 @@ export default {
|
||||||
|
|
||||||
newMinute = newMinute < 0 ? 60 + newMinute : newMinute;
|
newMinute = newMinute < 0 ? 60 + newMinute : newMinute;
|
||||||
|
|
||||||
if (this.validateTime(this.currentHour, newMinute, this.currentSecond, true)) {
|
if (this.validateTime(this.currentHour, newMinute, this.currentSecond, this.pm)) {
|
||||||
this.currentMinute = newMinute;
|
this.currentMinute = newMinute;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1564,7 +1564,7 @@ export default {
|
||||||
incrementSecond(event) {
|
incrementSecond(event) {
|
||||||
let newSecond = this.currentSecond + this.stepSecond;
|
let newSecond = this.currentSecond + this.stepSecond;
|
||||||
|
|
||||||
if (this.validateTime(this.currentHour, this.currentMinute, newSecond, true)) {
|
if (this.validateTime(this.currentHour, this.currentMinute, newSecond, this.pm)) {
|
||||||
this.currentSecond = newSecond > 59 ? newSecond - 60 : newSecond;
|
this.currentSecond = newSecond > 59 ? newSecond - 60 : newSecond;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1575,7 +1575,7 @@ export default {
|
||||||
|
|
||||||
newSecond = newSecond < 0 ? 60 + newSecond : newSecond;
|
newSecond = newSecond < 0 ? 60 + newSecond : newSecond;
|
||||||
|
|
||||||
if (this.validateTime(this.currentHour, this.currentMinute, newSecond, true)) {
|
if (this.validateTime(this.currentHour, this.currentMinute, newSecond, this.pm)) {
|
||||||
this.currentSecond = newSecond;
|
this.currentSecond = newSecond;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue