Fixed issue 3356 by correctly checking the am/pm status when incrementing minutes
parent
03dd43d1be
commit
9e584df510
|
@ -1505,7 +1505,6 @@ export default {
|
|||
|
||||
if (this.hourFormat == '24') newHour = newHour >= 24 ? newHour - 24 : newHour;
|
||||
else if (this.hourFormat == '12') {
|
||||
// Before the AM/PM break, now after
|
||||
if (prevHour < 12 && newHour > 11) {
|
||||
newPM = !this.pm;
|
||||
}
|
||||
|
@ -1544,7 +1543,7 @@ export default {
|
|||
incrementMinute(event) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -1555,7 +1554,7 @@ export default {
|
|||
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -1564,7 +1563,7 @@ export default {
|
|||
incrementSecond(event) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -1575,7 +1574,7 @@ export default {
|
|||
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue