Skip to content

Commit f3eb6ef

Browse files
committed
chore : 1.2.0 bundle
1 parent 87adf37 commit f3eb6ef

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

code-snippet.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,10 +1702,10 @@ tui.util.Enum = Enum;
17021702
return replaceMap.YYYY(date);
17031703
},
17041704
A: function(date) {
1705-
return date.meridian;
1705+
return date.meridiem;
17061706
},
17071707
a: function(date) {
1708-
return date.meridian;
1708+
return date.meridiem;
17091709
},
17101710
hh: function(date) {
17111711
var hour = date.hour;
@@ -1777,7 +1777,7 @@ tui.util.Enum = Enum;
17771777
* Return a string that transformed from the given form and date.
17781778
* @param {string} form - Date form
17791779
* @param {Date|Object} date - Date object
1780-
* @param {{meridianSet: {AM: string, PM: string}}} option - Option
1780+
* @param {{meridiemSet: {AM: string, PM: string}}} option - Option
17811781
* @returns {boolean|string} A transformed string or false.
17821782
* @memberOf tui.util
17831783
* @example
@@ -1789,7 +1789,7 @@ tui.util.Enum = Enum;
17891789
* // days | D / DD / d / dd
17901790
* // hours | H / HH / h / hh
17911791
* // minutes | m / mm
1792-
* // meridian(AM,PM) | A / a
1792+
* // meridiem(AM,PM) | A / a
17931793
*
17941794
* var dateStr1 = formatDate('yyyy-MM-dd', {
17951795
* year: 2014,
@@ -1813,7 +1813,7 @@ tui.util.Enum = Enum;
18131813
* alert(dateStr3); // '2010년 3월 13일'
18141814
*
18151815
* var option4 = {
1816-
* meridianSet: {
1816+
* meridiemSet: {
18171817
* AM: '오전',
18181818
* PM: '오후'
18191819
* }
@@ -1824,7 +1824,7 @@ tui.util.Enum = Enum;
18241824
* alert(dateStr4); // '1999-09-09 오후 01:02'
18251825
*/
18261826
function formatDate(form, date, option) {
1827-
var meridian, nDate, resultStr;
1827+
var meridiem, nDate, resultStr;
18281828

18291829
if (tui.util.isDate(date)) {
18301830
nDate = {
@@ -1848,13 +1848,13 @@ tui.util.Enum = Enum;
18481848
return false;
18491849
}
18501850

1851-
nDate.meridian = '';
1851+
nDate.meridiem = '';
18521852
if (/[^\\][aA]\b/g.test(form)) {
1853-
meridian = (nDate.hour > 12) ?
1854-
tui.util.pick(option, 'meridianSet', 'PM') || 'PM'
1855-
: tui.util.pick(option, 'meridianSet', 'AM') || 'AM';
1853+
meridiem = (nDate.hour > 12) ?
1854+
tui.util.pick(option, 'meridiemSet', 'PM') || 'PM'
1855+
: tui.util.pick(option, 'meridiemSet', 'AM') || 'AM';
18561856
nDate.hour %= 12;
1857-
nDate.meridian = meridian;
1857+
nDate.meridiem = meridiem;
18581858
}
18591859

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

0 commit comments

Comments
 (0)