Merge pull request jdewit#17 from terribletriojoe/master

Fixed meridian bug in 'current' time initialization
lyosha85 · Jun 18, 2012 · 4c343a3 · 4c343a3
2 parents de02883 + 00803c7
commit 4c343a3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/bootstrap-timepicker.js b/js/bootstrap-timepicker.js
@@ -137,8 +137,10 @@
                     if ( this.showMeridian ) {
                         if (hours === 0) {
                             hours = 12;
-                        } else if (hours > 12) {
-                            hours = hours - 12;
+                        } else if (hours >= 12) {
+                            if (hours > 12) {
+                                hours = hours - 12;
+                            }
                             meridian = "PM";
                         } else {
                            meridian = "AM";