Skip to content

Commit 59cdb95

Browse files
author
이민규/FE개발랩/NE
committed
Merge pull request #62 from fe/feature/formatDate-merdianSet
formatDate 버그 수정
2 parents f3eb6ef + 79649ba commit 59cdb95

File tree

5 files changed

+37
-16
lines changed

5 files changed

+37
-16
lines changed

code-snippet.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*!code-snippet v1.2.0 | NHN Entertainment*/
1+
/*!code-snippet v1.2.1 | NHN Entertainment*/
22
/**********
33
* array.js
44
**********/
@@ -1849,20 +1849,21 @@ tui.util.Enum = Enum;
18491849
}
18501850

18511851
nDate.meridiem = '';
1852-
if (/[^\\][aA]\b/g.test(form)) {
1853-
meridiem = (nDate.hour > 12) ?
1852+
if (/([^\\]|^)[aA]\b/.test(form)) {
1853+
meridiem = (nDate.hour > 11) ?
18541854
tui.util.pick(option, 'meridiemSet', 'PM') || 'PM'
18551855
: tui.util.pick(option, 'meridiemSet', 'AM') || 'AM';
1856-
nDate.hour %= 12;
1856+
if (nDate.hour > 12) { //See the clock system: https://en.wikipedia.org/wiki/12-hour_clock
1857+
nDate.hour %= 12;
1858+
}
18571859
nDate.meridiem = meridiem;
18581860
}
18591861

18601862
resultStr = form.replace(tokens, function(key) {
18611863
if (key.indexOf('\\') > -1) { // escape character
1862-
return key.replace(/\\/g, '');
1863-
} else {
1864-
return replaceMap[key](nDate) || '';
1864+
return key.replace(/\\/, '');
18651865
}
1866+
return replaceMap[key](nDate) || '';
18661867
});
18671868
return resultStr;
18681869
}

0 commit comments

Comments
 (0)