From: Iskren Chernev Date: Sat, 16 Dec 2023 20:55:25 +0000 (+0200) Subject: [misc] Reformat according to latest prettier X-Git-Tag: 2.30.0~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=933cb24dd744de18df8102775c73aa1baea6d9c7;p=thirdparty%2Fmoment.git [misc] Reformat according to latest prettier --- diff --git a/src/lib/create/check-overflow.js b/src/lib/create/check-overflow.js index 9cb0fba75..ee0881253 100644 --- a/src/lib/create/check-overflow.js +++ b/src/lib/create/check-overflow.js @@ -21,21 +21,21 @@ export default function checkOverflow(m) { a[MONTH] < 0 || a[MONTH] > 11 ? MONTH : a[DATE] < 1 || a[DATE] > daysInMonth(a[YEAR], a[MONTH]) - ? DATE - : a[HOUR] < 0 || - a[HOUR] > 24 || - (a[HOUR] === 24 && - (a[MINUTE] !== 0 || - a[SECOND] !== 0 || - a[MILLISECOND] !== 0)) - ? HOUR - : a[MINUTE] < 0 || a[MINUTE] > 59 - ? MINUTE - : a[SECOND] < 0 || a[SECOND] > 59 - ? SECOND - : a[MILLISECOND] < 0 || a[MILLISECOND] > 999 - ? MILLISECOND - : -1; + ? DATE + : a[HOUR] < 0 || + a[HOUR] > 24 || + (a[HOUR] === 24 && + (a[MINUTE] !== 0 || + a[SECOND] !== 0 || + a[MILLISECOND] !== 0)) + ? HOUR + : a[MINUTE] < 0 || a[MINUTE] > 59 + ? MINUTE + : a[SECOND] < 0 || a[SECOND] > 59 + ? SECOND + : a[MILLISECOND] < 0 || a[MILLISECOND] > 999 + ? MILLISECOND + : -1; if ( getParsingFlags(m)._overflowDayOfYear && diff --git a/src/lib/locale/en.js b/src/lib/locale/en.js index 470bd27a7..22578a87a 100644 --- a/src/lib/locale/en.js +++ b/src/lib/locale/en.js @@ -28,12 +28,12 @@ getSetGlobalLocale('en', { toInt((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, }); diff --git a/src/lib/moment/calendar.js b/src/lib/moment/calendar.js index fdd53dcb3..7b45d4ede 100644 --- a/src/lib/moment/calendar.js +++ b/src/lib/moment/calendar.js @@ -10,16 +10,16 @@ export function getCalendarFormat(myMoment, now) { return diff < -6 ? 'sameElse' : diff < -1 - ? 'lastWeek' - : diff < 0 - ? 'lastDay' - : diff < 1 - ? 'sameDay' - : diff < 2 - ? 'nextDay' - : diff < 7 - ? 'nextWeek' - : 'sameElse'; + ? 'lastWeek' + : diff < 0 + ? 'lastDay' + : diff < 1 + ? 'sameDay' + : diff < 2 + ? 'nextDay' + : diff < 7 + ? 'nextWeek' + : 'sameElse'; } export function calendar(time, formats) { diff --git a/src/lib/units/day-of-week.js b/src/lib/units/day-of-week.js index b2d5ce23e..15c85c500 100644 --- a/src/lib/units/day-of-week.js +++ b/src/lib/units/day-of-week.js @@ -130,24 +130,24 @@ export function localeWeekdays(m, format) { return m === true ? shiftWeekdays(weekdays, this._week.dow) : m - ? weekdays[m.day()] - : weekdays; + ? weekdays[m.day()] + : weekdays; } export function localeWeekdaysShort(m) { return m === true ? shiftWeekdays(this._weekdaysShort, this._week.dow) : m - ? this._weekdaysShort[m.day()] - : this._weekdaysShort; + ? this._weekdaysShort[m.day()] + : this._weekdaysShort; } export function localeWeekdaysMin(m) { return m === true ? shiftWeekdays(this._weekdaysMin, this._week.dow) : m - ? this._weekdaysMin[m.day()] - : this._weekdaysMin; + ? this._weekdaysMin[m.day()] + : this._weekdaysMin; } function handleStrictParse(weekdayName, format, strict) { diff --git a/src/locale/ar-dz.js b/src/locale/ar-dz.js index 12687a6c5..61a41e724 100644 --- a/src/locale/ar-dz.js +++ b/src/locale/ar-dz.js @@ -12,14 +12,14 @@ var pluralForm = function (n) { return n === 0 ? 0 : n === 1 - ? 1 - : n === 2 - ? 2 - : n % 100 >= 3 && n % 100 <= 10 - ? 3 - : n % 100 >= 11 - ? 4 - : 5; + ? 1 + : n === 2 + ? 2 + : n % 100 >= 3 && n % 100 <= 10 + ? 3 + : n % 100 >= 11 + ? 4 + : 5; }, plurals = { s: [ diff --git a/src/locale/ar-ly.js b/src/locale/ar-ly.js index a8d4056d1..88d5ef512 100644 --- a/src/locale/ar-ly.js +++ b/src/locale/ar-ly.js @@ -20,14 +20,14 @@ var symbolMap = { return n === 0 ? 0 : n === 1 - ? 1 - : n === 2 - ? 2 - : n % 100 >= 3 && n % 100 <= 10 - ? 3 - : n % 100 >= 11 - ? 4 - : 5; + ? 1 + : n === 2 + ? 2 + : n % 100 >= 3 && n % 100 <= 10 + ? 3 + : n % 100 >= 11 + ? 4 + : 5; }, plurals = { s: [ diff --git a/src/locale/ar.js b/src/locale/ar.js index fb430b964..846e4910b 100644 --- a/src/locale/ar.js +++ b/src/locale/ar.js @@ -34,14 +34,14 @@ var symbolMap = { return n === 0 ? 0 : n === 1 - ? 1 - : n === 2 - ? 2 - : n % 100 >= 3 && n % 100 <= 10 - ? 3 - : n % 100 >= 11 - ? 4 - : 5; + ? 1 + : n === 2 + ? 2 + : n % 100 >= 3 && n % 100 <= 10 + ? 3 + : n % 100 >= 11 + ? 4 + : 5; }, plurals = { s: [ diff --git a/src/locale/be.js b/src/locale/be.js index 4b4d1cb27..39e97a263 100644 --- a/src/locale/be.js +++ b/src/locale/be.js @@ -11,8 +11,8 @@ function plural(word, num) { return num % 10 === 1 && num % 100 !== 11 ? forms[0] : num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) - ? forms[1] - : forms[2]; + ? forms[1] + : forms[2]; } function relativeTimeWithPlural(number, withoutSuffix, key) { var format = { diff --git a/src/locale/ca.js b/src/locale/ca.js index 0fe9da472..c3562114a 100644 --- a/src/locale/ca.js +++ b/src/locale/ca.js @@ -82,12 +82,12 @@ export default moment.defineLocale('ca', { number === 1 ? 'r' : number === 2 - ? 'n' - : number === 3 - ? 'r' - : number === 4 - ? 't' - : 'è'; + ? 'n' + : number === 3 + ? 'r' + : number === 4 + ? 't' + : 'è'; if (period === 'w' || period === 'W') { output = 'a'; } diff --git a/src/locale/cv.js b/src/locale/cv.js index f349157db..06c196ab5 100644 --- a/src/locale/cv.js +++ b/src/locale/cv.js @@ -36,8 +36,8 @@ export default moment.defineLocale('cv', { var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) - ? 'тан' - : 'ран'; + ? 'тан' + : 'ран'; return output + affix; }, past: '%s каялла', diff --git a/src/locale/en-au.js b/src/locale/en-au.js index 8ee6197f2..301e9db57 100644 --- a/src/locale/en-au.js +++ b/src/locale/en-au.js @@ -53,12 +53,12 @@ export default moment.defineLocale('en-au', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, week: { diff --git a/src/locale/en-ca.js b/src/locale/en-ca.js index bc4e9a532..8099e048c 100644 --- a/src/locale/en-ca.js +++ b/src/locale/en-ca.js @@ -53,12 +53,12 @@ export default moment.defineLocale('en-ca', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, }); diff --git a/src/locale/en-gb.js b/src/locale/en-gb.js index 9391cc943..acd544a01 100644 --- a/src/locale/en-gb.js +++ b/src/locale/en-gb.js @@ -53,12 +53,12 @@ export default moment.defineLocale('en-gb', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, week: { diff --git a/src/locale/en-ie.js b/src/locale/en-ie.js index 8200e55fd..8e79f6372 100644 --- a/src/locale/en-ie.js +++ b/src/locale/en-ie.js @@ -53,12 +53,12 @@ export default moment.defineLocale('en-ie', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, week: { diff --git a/src/locale/en-il.js b/src/locale/en-il.js index ba16f103c..94908df91 100644 --- a/src/locale/en-il.js +++ b/src/locale/en-il.js @@ -53,12 +53,12 @@ export default moment.defineLocale('en-il', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, }); diff --git a/src/locale/en-in.js b/src/locale/en-in.js index 7d940d2f0..f685176c7 100644 --- a/src/locale/en-in.js +++ b/src/locale/en-in.js @@ -53,12 +53,12 @@ export default moment.defineLocale('en-in', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, week: { diff --git a/src/locale/en-nz.js b/src/locale/en-nz.js index dff324cc2..66c9bfc3b 100644 --- a/src/locale/en-nz.js +++ b/src/locale/en-nz.js @@ -53,12 +53,12 @@ export default moment.defineLocale('en-nz', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, week: { diff --git a/src/locale/en-sg.js b/src/locale/en-sg.js index 433531e01..b36bda43a 100644 --- a/src/locale/en-sg.js +++ b/src/locale/en-sg.js @@ -53,12 +53,12 @@ export default moment.defineLocale('en-sg', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, week: { diff --git a/src/locale/it.js b/src/locale/it.js index 46aaccfbe..0aa5721b4 100644 --- a/src/locale/it.js +++ b/src/locale/it.js @@ -61,8 +61,8 @@ export default moment.defineLocale('it', { (this.hours() > 1 ? 'lle ' : this.hours() === 0 - ? ' ' - : "ll'") + + ? ' ' + : "ll'") + ']LT' ); default: @@ -71,8 +71,8 @@ export default moment.defineLocale('it', { (this.hours() > 1 ? 'lle ' : this.hours() === 0 - ? ' ' - : "ll'") + + ? ' ' + : "ll'") + ']LT' ); } diff --git a/src/locale/lt.js b/src/locale/lt.js index f01126136..83c159566 100644 --- a/src/locale/lt.js +++ b/src/locale/lt.js @@ -28,8 +28,8 @@ function translateSingular(number, withoutSuffix, key, isFuture) { return withoutSuffix ? forms(key)[0] : isFuture - ? forms(key)[1] - : forms(key)[2]; + ? forms(key)[1] + : forms(key)[2]; } function special(number) { return number % 10 === 0 || (number > 10 && number < 20); diff --git a/src/locale/me.js b/src/locale/me.js index c0986df67..e22c8d906 100644 --- a/src/locale/me.js +++ b/src/locale/me.js @@ -20,8 +20,8 @@ var translator = { return number === 1 ? wordKey[0] : number >= 2 && number <= 4 - ? wordKey[1] - : wordKey[2]; + ? wordKey[1] + : wordKey[2]; }, translate: function (number, withoutSuffix, key) { var wordKey = translator.words[key]; diff --git a/src/locale/oc-lnc.js b/src/locale/oc-lnc.js index cc055613a..2e67d7394 100644 --- a/src/locale/oc-lnc.js +++ b/src/locale/oc-lnc.js @@ -67,12 +67,12 @@ export default moment.defineLocale('oc-lnc', { number === 1 ? 'r' : number === 2 - ? 'n' - : number === 3 - ? 'r' - : number === 4 - ? 't' - : 'è'; + ? 'n' + : number === 3 + ? 'r' + : number === 4 + ? 't' + : 'è'; if (period === 'w' || period === 'W') { output = 'a'; } diff --git a/src/locale/ru.js b/src/locale/ru.js index 9f17e18ea..d214850c0 100644 --- a/src/locale/ru.js +++ b/src/locale/ru.js @@ -11,8 +11,8 @@ function plural(word, num) { return num % 10 === 1 && num % 100 !== 11 ? forms[0] : num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) - ? forms[1] - : forms[2]; + ? forms[1] + : forms[2]; } function relativeTimeWithPlural(number, withoutSuffix, key) { var format = { diff --git a/src/locale/sv.js b/src/locale/sv.js index 6f5c1d999..4a37cdb5b 100644 --- a/src/locale/sv.js +++ b/src/locale/sv.js @@ -53,12 +53,12 @@ export default moment.defineLocale('sv', { ~~((number % 100) / 10) === 1 ? ':e' : b === 1 - ? ':a' - : b === 2 - ? ':a' - : b === 3 - ? ':e' - : ':e'; + ? ':a' + : b === 2 + ? ':a' + : b === 3 + ? ':e' + : ':e'; return number + output; }, week: { diff --git a/src/locale/tet.js b/src/locale/tet.js index 8d834d71f..5f7d95c09 100644 --- a/src/locale/tet.js +++ b/src/locale/tet.js @@ -53,12 +53,12 @@ export default moment.defineLocale('tet', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, week: { diff --git a/src/locale/tlh.js b/src/locale/tlh.js index 95b91513c..ccc5d295e 100644 --- a/src/locale/tlh.js +++ b/src/locale/tlh.js @@ -12,10 +12,10 @@ function translateFuture(output) { output.indexOf('jaj') !== -1 ? time.slice(0, -3) + 'leS' : output.indexOf('jar') !== -1 - ? time.slice(0, -3) + 'waQ' - : output.indexOf('DIS') !== -1 - ? time.slice(0, -3) + 'nem' - : time + ' pIq'; + ? time.slice(0, -3) + 'waQ' + : output.indexOf('DIS') !== -1 + ? time.slice(0, -3) + 'nem' + : time + ' pIq'; return time; } @@ -25,10 +25,10 @@ function translatePast(output) { output.indexOf('jaj') !== -1 ? time.slice(0, -3) + 'Hu’' : output.indexOf('jar') !== -1 - ? time.slice(0, -3) + 'wen' - : output.indexOf('DIS') !== -1 - ? time.slice(0, -3) + 'ben' - : time + ' ret'; + ? time.slice(0, -3) + 'wen' + : output.indexOf('DIS') !== -1 + ? time.slice(0, -3) + 'ben' + : time + ' ret'; return time; } diff --git a/src/locale/tzl.js b/src/locale/tzl.js index 62bfcdc5f..5447082a6 100644 --- a/src/locale/tzl.js +++ b/src/locale/tzl.js @@ -84,6 +84,6 @@ function processRelativeTime(number, withoutSuffix, key, isFuture) { return isFuture ? format[key][0] : withoutSuffix - ? format[key][0] - : format[key][1]; + ? format[key][0] + : format[key][1]; } diff --git a/src/locale/uk.js b/src/locale/uk.js index 8879b5e2a..670ffccff 100644 --- a/src/locale/uk.js +++ b/src/locale/uk.js @@ -10,8 +10,8 @@ function plural(word, num) { return num % 10 === 1 && num % 100 !== 11 ? forms[0] : num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) - ? forms[1] - : forms[2]; + ? forms[1] + : forms[2]; } function relativeTimeWithPlural(number, withoutSuffix, key) { var format = { @@ -59,8 +59,8 @@ function weekdaysCaseReplace(m, format) { nounCase = /(\[[ВвУу]\]) ?dddd/.test(format) ? 'accusative' : /\[?(?:минулої|наступної)? ?\] ?dddd/.test(format) - ? 'genitive' - : 'nominative'; + ? 'genitive' + : 'nominative'; return weekdays[nounCase][m.day()]; } function processHoursFunction(str) { diff --git a/src/locale/x-pseudo.js b/src/locale/x-pseudo.js index f8adbb8ff..90df555f6 100644 --- a/src/locale/x-pseudo.js +++ b/src/locale/x-pseudo.js @@ -58,12 +58,12 @@ export default moment.defineLocale('x-pseudo', { ~~((number % 100) / 10) === 1 ? 'th' : b === 1 - ? 'st' - : b === 2 - ? 'nd' - : b === 3 - ? 'rd' - : 'th'; + ? 'st' + : b === 2 + ? 'nd' + : b === 3 + ? 'rd' + : 'th'; return number + output; }, week: { diff --git a/src/test/moment/calendar.js b/src/test/moment/calendar.js index b1e472879..64f5d7a28 100644 --- a/src/test/moment/calendar.js +++ b/src/test/moment/calendar.js @@ -30,22 +30,22 @@ test('extending calendar options', function (assert) { diff < -6 ? 'sameElse' : diff < -1 - ? 'lastWeek' - : diff < 0 - ? 'lastDay' - : diff < 1 - ? 'sameDay' - : diff < 2 - ? 'nextDay' - : diff < 7 - ? 'nextWeek' - : myMoment.month() === now.month() && - myMoment.year() === now.year() - ? 'thisMonth' - : nextMonth.month() === myMoment.month() && - nextMonth.year() === myMoment.year() - ? 'nextMonth' - : 'sameElse'; + ? 'lastWeek' + : diff < 0 + ? 'lastDay' + : diff < 1 + ? 'sameDay' + : diff < 2 + ? 'nextDay' + : diff < 7 + ? 'nextWeek' + : myMoment.month() === now.month() && + myMoment.year() === now.year() + ? 'thisMonth' + : nextMonth.month() === myMoment.month() && + nextMonth.year() === myMoment.year() + ? 'nextMonth' + : 'sameElse'; return retVal; }; diff --git a/src/test/moment/zones.js b/src/test/moment/zones.js index f9f5dd70d..e42729dab 100644 --- a/src/test/moment/zones.js +++ b/src/test/moment/zones.js @@ -765,27 +765,9 @@ test('timezone format', function (assert) { assert.equal(moment().zone(-90).format('ZZ'), '+0130', '-90 -> +0130'); assert.equal(moment().zone(-120).format('ZZ'), '+0200', '-120 -> +0200'); - assert.equal( - moment() - .zone(+60) - .format('ZZ'), - '-0100', - '+60 -> -0100' - ); - assert.equal( - moment() - .zone(+90) - .format('ZZ'), - '-0130', - '+90 -> -0130' - ); - assert.equal( - moment() - .zone(+120) - .format('ZZ'), - '-0200', - '+120 -> -0200' - ); + assert.equal(moment().zone(+60).format('ZZ'), '-0100', '+60 -> -0100'); + assert.equal(moment().zone(+90).format('ZZ'), '-0130', '+90 -> -0130'); + assert.equal(moment().zone(+120).format('ZZ'), '-0200', '+120 -> -0200'); }); test('parse zone without a timezone', function (assert) {