fix: Show wrong midday(12 am => 12 pm)

fix : Show wrong midday(12 am => 12 pm) on time grid primary time (fix #321)
nhn · May 16, 2019 · b0b435f · b0b435f
2 parents e7a2fd2 + bb66da1
commit b0b435f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/examples/example15-template-for-timegrid.html b/examples/example15-template-for-timegrid.html
@@ -154,23 +154,21 @@
     },
     timegridDisplayPrimayTime: function(time) {
       /* will be deprecated. use 'timegridDisplayPrimaryTime' */
-      var meridiem = 'am';
       var hour = time.hour;
+      var meridiem = hour >= 12 ? 'pm' : 'am';
 
-      if (time.hour > 12) {
-        meridiem = 'pm';
-        hour = time.hour - 12;
+      if (hour > 12) {
+        hour = hour - 12;
       }
 
       return hour + ' ' + meridiem;
     },
     timegridDisplayPrimaryTime: function(time) {
-      var meridiem = 'am';
       var hour = time.hour;
+      var meridiem = hour >= 12 ? 'pm' : 'am';
 
-      if (time.hour > 12) {
-        meridiem = 'pm';
-        hour = time.hour - 12;
+      if (hour > 12) {
+        hour = hour - 12;
       }
 
       return hour + ' ' + meridiem;

diff --git a/src/js/view/template/helper.js b/src/js/view/template/helper.js
@@ -365,12 +365,11 @@ var helpers = {
     },
 
     'timegridDisplayPrimaryTime-tmpl': function(time) {
-        var meridiem = 'am';
         var hour = time.hour;
+        var meridiem = hour >= 12 ? 'pm' : 'am';
 
-        if (time.hour > 12) {
-            meridiem = 'pm';
-            hour = time.hour - 12;
+        if (hour > 12) {
+            hour = hour - 12;
         }
 
         return hour + ' ' + meridiem;