Skip to content

Commit 276273d

Browse files
author
minkyu-yi
committed
fix: meridian --> meridiem
1 parent e2bdec7 commit 276273d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/formatDate.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
return replaceMap.YYYY(date);
5757
},
5858
A: function(date) {
59-
return date.meridian;
59+
return date.meridiem;
6060
},
6161
a: function(date) {
62-
return date.meridian;
62+
return date.meridiem;
6363
},
6464
hh: function(date) {
6565
var hour = date.hour;
@@ -202,13 +202,13 @@
202202
return false;
203203
}
204204

205-
nDate.meridian = '';
205+
nDate.meridiem = '';
206206
if (/[^\\][aA]\b/g.test(form)) {
207207
meridiem = (nDate.hour > 12) ?
208208
tui.util.pick(option, 'meridiemSet', 'PM') || 'PM'
209209
: tui.util.pick(option, 'meridiemSet', 'AM') || 'AM';
210210
nDate.hour %= 12;
211-
nDate.meridian = meridiem;
211+
nDate.meridiem = meridiem;
212212
}
213213

214214
resultStr = form.replace(tokens, function(key) {

0 commit comments

Comments
 (0)