Merge pull request jdewit#28 from terribletriojoe/master

Fixed meridian toggle bug in decrementHour
lyosha85 · Jul 23, 2012 · 2e8bfcf · 2e8bfcf
2 parents fe6d0db + c61bebb
commit 2e8bfcf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/bootstrap-timepicker.js b/js/bootstrap-timepicker.js
@@ -395,9 +395,11 @@
         , decrementHour: function() {
             if (this.showMeridian) {
                 if (this.hour === 1) {
-                    this.hour = 12;
-                    return this.toggleMeridian();
+                    return this.hour = 12;
                 } 
+                else if (this.hour === 12) {
+                    this.toggleMeridian();
+                }
             }
             if (this.hour === 0) {
                 return this.hour = 23;