From c3f338db020fa8d9f8a479461c70072e3db31ff4 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 13 Dec 2016 23:43:46 +0100 Subject: [PATCH] Fixed issue #329 - Pending event time after 22:59 jumps back to 22:59. --- .../javascripts/app/lib/bootstrap/bootstrap-timepicker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js b/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js index e542cb214..2df178a6f 100644 --- a/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js +++ b/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js @@ -838,7 +838,7 @@ minute = 59; } - if (hour >= this.maxHours) { + if (hour > this.maxHours) { // No day/date handling. hour = this.maxHours - 1; } @@ -859,7 +859,7 @@ } else if (hour < 12 && timeMode === 2) { hour += 12; } else { - if (hour >= this.maxHours) { + if (hour > this.maxHours) { hour = this.maxHours - 1; } else if ((hour < 0) || (hour === 12 && timeMode === 1)){ hour = 0;