diff --git a/docs/i18nContributionGuide.md b/docs/i18nContributionGuide.md index 0fd4c197ad..09afabb0fb 100644 --- a/docs/i18nContributionGuide.md +++ b/docs/i18nContributionGuide.md @@ -161,7 +161,7 @@ Function that takes a numeric argument and returns a string with ordinal number: ```js // In `en-US` locale: function ordinalNumber (dirtyNumber, dirtyOptions) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var rem100 = number % 100 if (rem100 > 20 || rem100 < 10) { @@ -320,7 +320,7 @@ var localize = { values: quarterValues, defaultWidth: 'wide', argumentCallback: function (quarter) { - return Number(quarter) - 1 + return Math.trunc(Number(quarter)) - 1 } }), // ... diff --git a/src/_lib/addUTCMinutes/index.js b/src/_lib/addUTCMinutes/index.js index 17abdb5521..9f9ba96b0f 100644 --- a/src/_lib/addUTCMinutes/index.js +++ b/src/_lib/addUTCMinutes/index.js @@ -8,7 +8,7 @@ export default function addUTCMinutes (dirtyDate, dirtyAmount, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) date.setUTCMinutes(date.getUTCMinutes() + amount) return date } diff --git a/src/_lib/getUTCWeekYear/index.js b/src/_lib/getUTCWeekYear/index.js index 226040b887..74962aa3f5 100644 --- a/src/_lib/getUTCWeekYear/index.js +++ b/src/_lib/getUTCWeekYear/index.js @@ -19,11 +19,11 @@ export default function getUTCWeekYear (dirtyDate, dirtyOptions) { var defaultFirstWeekContainsDate = localeFirstWeekContainsDate === undefined ? 1 - : Number(localeFirstWeekContainsDate) + : Math.trunc(Number(localeFirstWeekContainsDate)) var firstWeekContainsDate = options.firstWeekContainsDate === undefined ? defaultFirstWeekContainsDate - : Number(options.firstWeekContainsDate) + : Math.trunc(Number(options.firstWeekContainsDate)) // Test if weekStartsOn is between 1 and 7 _and_ is not NaN if (!(firstWeekContainsDate >= 1 && firstWeekContainsDate <= 7)) { diff --git a/src/_lib/setUTCDay/index.js b/src/_lib/setUTCDay/index.js index 2ef90324cd..ef7a9d1eb5 100644 --- a/src/_lib/setUTCDay/index.js +++ b/src/_lib/setUTCDay/index.js @@ -10,8 +10,8 @@ export default function setUTCDay (dirtyDate, dirtyDay, dirtyOptions) { var options = dirtyOptions || {} var locale = options.locale var localeWeekStartsOn = locale && locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { @@ -19,7 +19,7 @@ export default function setUTCDay (dirtyDate, dirtyDay, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var day = Number(dirtyDay) + var day = Math.trunc(Number(dirtyDay)) var currentDay = date.getUTCDay() diff --git a/src/_lib/setUTCISODay/index.js b/src/_lib/setUTCISODay/index.js index 24ebf5afa3..0c1e8abffb 100644 --- a/src/_lib/setUTCISODay/index.js +++ b/src/_lib/setUTCISODay/index.js @@ -7,7 +7,7 @@ export default function setUTCISODay (dirtyDate, dirtyDay, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var day = Number(dirtyDay) + var day = Math.trunc(Number(dirtyDay)) if (day % 7 === 0) { day = day - 7 diff --git a/src/_lib/setUTCISOWeek/index.js b/src/_lib/setUTCISOWeek/index.js index 18f0b4baa5..8738302f88 100644 --- a/src/_lib/setUTCISOWeek/index.js +++ b/src/_lib/setUTCISOWeek/index.js @@ -9,7 +9,7 @@ export default function setUTCISOWeek (dirtyDate, dirtyISOWeek, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var isoWeek = Number(dirtyISOWeek) + var isoWeek = Math.trunc(Number(dirtyISOWeek)) var diff = getUTCISOWeek(date, dirtyOptions) - isoWeek date.setUTCDate(date.getUTCDate() - diff * 7) return date diff --git a/src/_lib/setUTCWeek/index.js b/src/_lib/setUTCWeek/index.js index a319ebc311..71d33fd405 100644 --- a/src/_lib/setUTCWeek/index.js +++ b/src/_lib/setUTCWeek/index.js @@ -9,7 +9,7 @@ export default function setUTCWeek (dirtyDate, dirtyWeek, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var week = Number(dirtyWeek) + var week = Math.trunc(Number(dirtyWeek)) var diff = getUTCWeek(date, dirtyOptions) - week date.setUTCDate(date.getUTCDate() - diff * 7) return date diff --git a/src/_lib/startOfUTCWeek/index.js b/src/_lib/startOfUTCWeek/index.js index 9a62e99841..71a9fbce0a 100644 --- a/src/_lib/startOfUTCWeek/index.js +++ b/src/_lib/startOfUTCWeek/index.js @@ -10,8 +10,8 @@ export default function startOfUTCWeek (dirtyDate, dirtyOptions) { var options = dirtyOptions || {} var locale = options.locale var localeWeekStartsOn = locale && locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { diff --git a/src/_lib/startOfUTCWeekYear/index.js b/src/_lib/startOfUTCWeekYear/index.js index 3efea81953..0928859267 100644 --- a/src/_lib/startOfUTCWeekYear/index.js +++ b/src/_lib/startOfUTCWeekYear/index.js @@ -16,11 +16,11 @@ export default function startOfUTCWeekYear (dirtyDate, dirtyOptions) { var defaultFirstWeekContainsDate = localeFirstWeekContainsDate === undefined ? 1 - : Number(localeFirstWeekContainsDate) + : Math.trunc(Number(localeFirstWeekContainsDate)) var firstWeekContainsDate = options.firstWeekContainsDate === undefined ? defaultFirstWeekContainsDate - : Number(options.firstWeekContainsDate) + : Math.trunc(Number(options.firstWeekContainsDate)) var year = getUTCWeekYear(dirtyDate, dirtyOptions) var firstWeek = new Date(0) diff --git a/src/addDays/index.js b/src/addDays/index.js index d6243d2bc3..9c2889e7a6 100644 --- a/src/addDays/index.js +++ b/src/addDays/index.js @@ -27,7 +27,7 @@ export default function addDays (dirtyDate, dirtyAmount, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) date.setDate(date.getDate() + amount) return date } diff --git a/src/addHours/index.js b/src/addHours/index.js index 2f125c41d1..9a27434016 100644 --- a/src/addHours/index.js +++ b/src/addHours/index.js @@ -28,6 +28,6 @@ export default function addHours (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addMilliseconds(dirtyDate, amount * MILLISECONDS_IN_HOUR, dirtyOptions) } diff --git a/src/addISOWeekYears/index.js b/src/addISOWeekYears/index.js index f1a4ffde31..8f5862245e 100644 --- a/src/addISOWeekYears/index.js +++ b/src/addISOWeekYears/index.js @@ -29,6 +29,6 @@ export default function addISOWeekYears (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return setISOWeekYear(dirtyDate, getISOWeekYear(dirtyDate, dirtyOptions) + amount, dirtyOptions) } diff --git a/src/addMilliseconds/index.js b/src/addMilliseconds/index.js index bd16f19aac..b7195951f7 100644 --- a/src/addMilliseconds/index.js +++ b/src/addMilliseconds/index.js @@ -27,6 +27,6 @@ export default function addMilliseconds (dirtyDate, dirtyAmount, dirtyOptions) { } var timestamp = toDate(dirtyDate, dirtyOptions).getTime() - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return new Date(timestamp + amount) } diff --git a/src/addMinutes/index.js b/src/addMinutes/index.js index 557b8fc434..e87af4af0b 100644 --- a/src/addMinutes/index.js +++ b/src/addMinutes/index.js @@ -28,6 +28,6 @@ export default function addMinutes (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addMilliseconds(dirtyDate, amount * MILLISECONDS_IN_MINUTE, dirtyOptions) } diff --git a/src/addMonths/index.js b/src/addMonths/index.js index 71a24b15d6..8c0ba22ef4 100644 --- a/src/addMonths/index.js +++ b/src/addMonths/index.js @@ -28,7 +28,7 @@ export default function addMonths (dirtyDate, dirtyAmount, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) var desiredMonth = date.getMonth() + amount var dateWithDesiredMonth = new Date(0) dateWithDesiredMonth.setFullYear(date.getFullYear(), desiredMonth, 1) diff --git a/src/addQuarters/index.js b/src/addQuarters/index.js index 1375991ab1..3327279ef5 100644 --- a/src/addQuarters/index.js +++ b/src/addQuarters/index.js @@ -26,7 +26,7 @@ export default function addQuarters (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) var months = amount * 3 return addMonths(dirtyDate, months, dirtyOptions) } diff --git a/src/addSeconds/index.js b/src/addSeconds/index.js index 5a0ef4bd53..92e54b926d 100644 --- a/src/addSeconds/index.js +++ b/src/addSeconds/index.js @@ -26,6 +26,6 @@ export default function addSeconds (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addMilliseconds(dirtyDate, amount * 1000, dirtyOptions) } diff --git a/src/addWeeks/index.js b/src/addWeeks/index.js index e1b234a2a2..ca81d90e54 100644 --- a/src/addWeeks/index.js +++ b/src/addWeeks/index.js @@ -26,7 +26,7 @@ export default function addWeeks (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) var days = amount * 7 return addDays(dirtyDate, days, dirtyOptions) } diff --git a/src/addYears/index.js b/src/addYears/index.js index edbc80d8fd..3393722773 100644 --- a/src/addYears/index.js +++ b/src/addYears/index.js @@ -26,6 +26,6 @@ export default function addYears (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addMonths(dirtyDate, amount * 12, dirtyOptions) } diff --git a/src/endOfWeek/index.js b/src/endOfWeek/index.js index 51ef64f0dd..1afed74b42 100644 --- a/src/endOfWeek/index.js +++ b/src/endOfWeek/index.js @@ -38,8 +38,8 @@ export default function endOfWeek (dirtyDate, dirtyOptions) { var locale = options.locale var localeWeekStartsOn = locale && locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { diff --git a/src/format/index.js b/src/format/index.js index 66eea54244..af01a89e50 100644 --- a/src/format/index.js +++ b/src/format/index.js @@ -321,11 +321,11 @@ export default function format (dirtyDate, dirtyFormatStr, dirtyOptions) { var defaultFirstWeekContainsDate = localeFirstWeekContainsDate === undefined ? 1 - : Number(localeFirstWeekContainsDate) + : Math.trunc(Number(localeFirstWeekContainsDate)) var firstWeekContainsDate = options.firstWeekContainsDate === undefined ? defaultFirstWeekContainsDate - : Number(options.firstWeekContainsDate) + : Math.trunc(Number(options.firstWeekContainsDate)) // Test if weekStartsOn is between 1 and 7 _and_ is not NaN if (!(firstWeekContainsDate >= 1 && firstWeekContainsDate <= 7)) { @@ -333,8 +333,8 @@ export default function format (dirtyDate, dirtyFormatStr, dirtyOptions) { } var localeWeekStartsOn = locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { diff --git a/src/getWeekOfMonth/index.js b/src/getWeekOfMonth/index.js index 1e6e93fae1..3b8eca45c0 100644 --- a/src/getWeekOfMonth/index.js +++ b/src/getWeekOfMonth/index.js @@ -31,8 +31,8 @@ export default function getWeekOfMonth (dirtyDate, dirtyOptions) { var options = dirtyOptions || {} var locale = options.locale var localeWeekStartsOn = locale && locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { diff --git a/src/getWeekYear/index.js b/src/getWeekYear/index.js index 9d1ba49d67..331e83db6d 100644 --- a/src/getWeekYear/index.js +++ b/src/getWeekYear/index.js @@ -57,11 +57,11 @@ export default function getWeekYear (dirtyDate, dirtyOptions) { var defaultFirstWeekContainsDate = localeFirstWeekContainsDate === undefined ? 1 - : Number(localeFirstWeekContainsDate) + : Math.trunc(Number(localeFirstWeekContainsDate)) var firstWeekContainsDate = options.firstWeekContainsDate === undefined ? defaultFirstWeekContainsDate - : Number(options.firstWeekContainsDate) + : Math.trunc(Number(options.firstWeekContainsDate)) // Test if weekStartsOn is between 1 and 7 _and_ is not NaN if (!(firstWeekContainsDate >= 1 && firstWeekContainsDate <= 7)) { diff --git a/src/lastDayOfWeek/index.js b/src/lastDayOfWeek/index.js index a708007993..96d02df9f3 100644 --- a/src/lastDayOfWeek/index.js +++ b/src/lastDayOfWeek/index.js @@ -37,8 +37,8 @@ export default function lastDayOfWeek (dirtyDate, dirtyOptions) { var options = dirtyOptions || {} var locale = options.locale var localeWeekStartsOn = locale && locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { diff --git a/src/locale/af/_lib/localize/index.js b/src/locale/af/_lib/localize/index.js index 8b3546d725..de96aea979 100644 --- a/src/locale/af/_lib/localize/index.js +++ b/src/locale/af/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var rem100 = number % 100 if (rem100 < 20) { switch (rem100) { diff --git a/src/locale/bg/_lib/localize/index.js b/src/locale/bg/_lib/localize/index.js index 2d227f2eb9..6cc1cdee83 100644 --- a/src/locale/bg/_lib/localize/index.js +++ b/src/locale/bg/_lib/localize/index.js @@ -17,7 +17,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var rem100 = number % 100 if (rem100 > 20 || rem100 < 10) { diff --git a/src/locale/ca/_lib/localize/index.js b/src/locale/ca/_lib/localize/index.js index b0f8634721..b795241e0e 100644 --- a/src/locale/ca/_lib/localize/index.js +++ b/src/locale/ca/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) switch (number) { case 1: diff --git a/src/locale/cs/_lib/localize/index.js b/src/locale/cs/_lib/localize/index.js index 828388ef9b..6bf2054c0e 100644 --- a/src/locale/cs/_lib/localize/index.js +++ b/src/locale/cs/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } diff --git a/src/locale/da/_lib/localize/index.js b/src/locale/da/_lib/localize/index.js index 78f11d0a1d..aeb70f2f98 100644 --- a/src/locale/da/_lib/localize/index.js +++ b/src/locale/da/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } diff --git a/src/locale/de/_lib/localize/index.js b/src/locale/de/_lib/localize/index.js index a82b2b19af..c325bec6b4 100644 --- a/src/locale/de/_lib/localize/index.js +++ b/src/locale/de/_lib/localize/index.js @@ -23,7 +23,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } diff --git a/src/locale/el/_lib/localize/index.js b/src/locale/el/_lib/localize/index.js index b0ec72c61c..a17aec03f0 100644 --- a/src/locale/el/_lib/localize/index.js +++ b/src/locale/el/_lib/localize/index.js @@ -29,7 +29,7 @@ var ordinalSuffixes = { } function ordinalNumber (dirtyNumber, dirtyOptions) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var options = dirtyOptions || {} var suffix = options.unit ? ordinalSuffixes[String(options.unit)] : 'ος' return number + suffix diff --git a/src/locale/en-US/_lib/localize/index.js b/src/locale/en-US/_lib/localize/index.js index 6910442e2b..52100a9690 100644 --- a/src/locale/en-US/_lib/localize/index.js +++ b/src/locale/en-US/_lib/localize/index.js @@ -63,7 +63,7 @@ var dayPeriodValues = { } function ordinalNumber (dirtyNumber, dirtyOptions) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) // If ordinal numbers depend on context, for example, // if they are different for different grammatical genders, @@ -101,7 +101,7 @@ var localize = { values: quarterValues, defaultWidth: 'wide', argumentCallback: function (quarter) { - return Number(quarter) - 1 + return Math.trunc(Number(quarter)) - 1 } }), diff --git a/src/locale/eo/_lib/localize/index.js b/src/locale/eo/_lib/localize/index.js index 7771a9f209..141a8da31b 100644 --- a/src/locale/eo/_lib/localize/index.js +++ b/src/locale/eo/_lib/localize/index.js @@ -59,7 +59,7 @@ var dayPeriodValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '-a' } @@ -75,7 +75,7 @@ var localize = { values: quarterValues, defaultWidth: 'wide', argumentCallback: function (quarter) { - return Number(quarter) - 1 + return Math.trunc(Number(quarter)) - 1 } }), diff --git a/src/locale/es/_lib/localize/index.js b/src/locale/es/_lib/localize/index.js index dbc54f8cb0..5322bde50a 100644 --- a/src/locale/es/_lib/localize/index.js +++ b/src/locale/es/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + 'º' } diff --git a/src/locale/et/_lib/localize/index.js b/src/locale/et/_lib/localize/index.js index 8f03c7cefc..2e36d10e68 100644 --- a/src/locale/et/_lib/localize/index.js +++ b/src/locale/et/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } diff --git a/src/locale/fi/_lib/localize/index.js b/src/locale/fi/_lib/localize/index.js index 76d20763f7..0fe984abfd 100644 --- a/src/locale/fi/_lib/localize/index.js +++ b/src/locale/fi/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } diff --git a/src/locale/fil/_lib/localize/index.js b/src/locale/fil/_lib/localize/index.js index e49868cc79..1c7d9e7a8b 100644 --- a/src/locale/fil/_lib/localize/index.js +++ b/src/locale/fil/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return 'ika-' + number } diff --git a/src/locale/fr-CH/_lib/localize/index.js b/src/locale/fr-CH/_lib/localize/index.js index 0b6f196d7a..5b1d3c71ed 100644 --- a/src/locale/fr-CH/_lib/localize/index.js +++ b/src/locale/fr-CH/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function timeOfDay (dirtyHours, dirtyOptions) { - var hours = Number(dirtyHours) + var hours = Math.trunc(Number(dirtyHours)) var options = dirtyOptions || {} var type = options.type ? String(options.type) : 'long' @@ -55,7 +55,7 @@ function feminineOrdinalNumber (number) { } function ordinalNumber (dirtyNumber, dirtyOptions) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var options = dirtyOptions || {} var unit = options.unit ? String(options.unit) : null diff --git a/src/locale/fr/_lib/localize/index.js b/src/locale/fr/_lib/localize/index.js index 0b6f196d7a..5b1d3c71ed 100644 --- a/src/locale/fr/_lib/localize/index.js +++ b/src/locale/fr/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function timeOfDay (dirtyHours, dirtyOptions) { - var hours = Number(dirtyHours) + var hours = Math.trunc(Number(dirtyHours)) var options = dirtyOptions || {} var type = options.type ? String(options.type) : 'long' @@ -55,7 +55,7 @@ function feminineOrdinalNumber (number) { } function ordinalNumber (dirtyNumber, dirtyOptions) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var options = dirtyOptions || {} var unit = options.unit ? String(options.unit) : null diff --git a/src/locale/he/_lib/localize/index.js b/src/locale/he/_lib/localize/index.js index 1676bf45ec..2f5c256356 100755 --- a/src/locale/he/_lib/localize/index.js +++ b/src/locale/he/_lib/localize/index.js @@ -46,7 +46,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber, dirtyOptions) { - return Number(dirtyNumber) + return Math.trunc(Number(dirtyNumber)) } var localize = { diff --git a/src/locale/hr/_lib/localize/index.js b/src/locale/hr/_lib/localize/index.js index 5cba251a4e..0474833dd8 100644 --- a/src/locale/hr/_lib/localize/index.js +++ b/src/locale/hr/_lib/localize/index.js @@ -17,7 +17,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } diff --git a/src/locale/id/_lib/localize/index.js b/src/locale/id/_lib/localize/index.js index 2c93c210af..f68e34afd3 100644 --- a/src/locale/id/_lib/localize/index.js +++ b/src/locale/id/_lib/localize/index.js @@ -23,7 +23,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) // Can't use "pertama", "kedua" because can't be parsed switch (number) { diff --git a/src/locale/is/_lib/localize/index.js b/src/locale/is/_lib/localize/index.js index 78ab1c53bc..3d0cb9dfc6 100644 --- a/src/locale/is/_lib/localize/index.js +++ b/src/locale/is/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return String(number) } diff --git a/src/locale/it/_lib/localize/index.js b/src/locale/it/_lib/localize/index.js index 0fbd8922aa..4d3cb920e3 100644 --- a/src/locale/it/_lib/localize/index.js +++ b/src/locale/it/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + 'º' } diff --git a/src/locale/ja/_lib/localize/index.js b/src/locale/ja/_lib/localize/index.js index 7695c74e99..b6cde83ea6 100644 --- a/src/locale/ja/_lib/localize/index.js +++ b/src/locale/ja/_lib/localize/index.js @@ -17,7 +17,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '日' } diff --git a/src/locale/ka/_lib/localize/index.js b/src/locale/ka/_lib/localize/index.js index 7bc1be1a98..0aba02dda5 100644 --- a/src/locale/ka/_lib/localize/index.js +++ b/src/locale/ka/_lib/localize/index.js @@ -82,7 +82,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber, dirtyOptions) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) // If ordinal numbers depend on context, for example, // if they are different for different grammatical genders, diff --git a/src/locale/ko/_lib/localize/index.js b/src/locale/ko/_lib/localize/index.js index e4178e6d3c..f56f0bdabf 100644 --- a/src/locale/ko/_lib/localize/index.js +++ b/src/locale/ko/_lib/localize/index.js @@ -16,7 +16,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '일' } diff --git a/src/locale/mk/_lib/localize/index.js b/src/locale/mk/_lib/localize/index.js index eb11251535..633d54c44e 100644 --- a/src/locale/mk/_lib/localize/index.js +++ b/src/locale/mk/_lib/localize/index.js @@ -17,7 +17,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var rem100 = number % 100 if (rem100 > 20 || rem100 < 10) { diff --git a/src/locale/ms/_lib/localize/index.js b/src/locale/ms/_lib/localize/index.js index 96afa3d128..8ba66f8b31 100644 --- a/src/locale/ms/_lib/localize/index.js +++ b/src/locale/ms/_lib/localize/index.js @@ -23,7 +23,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) switch (number) { case 1: diff --git a/src/locale/nb/_lib/localize/index.js b/src/locale/nb/_lib/localize/index.js index c0133cfe22..260125c7f1 100644 --- a/src/locale/nb/_lib/localize/index.js +++ b/src/locale/nb/_lib/localize/index.js @@ -59,7 +59,7 @@ var dayPeriodValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } @@ -75,7 +75,7 @@ var localize = { values: quarterValues, defaultWidth: 'wide', argumentCallback: function (quarter) { - return Number(quarter) - 1 + return Math.trunc(Number(quarter)) - 1 } }), diff --git a/src/locale/nl/_lib/localize/index.js b/src/locale/nl/_lib/localize/index.js index 2be5fb425f..e463f4f680 100644 --- a/src/locale/nl/_lib/localize/index.js +++ b/src/locale/nl/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + 'e' } diff --git a/src/locale/pl/_lib/localize/index.js b/src/locale/pl/_lib/localize/index.js index d590f6d4f3..5e1e96db2d 100644 --- a/src/locale/pl/_lib/localize/index.js +++ b/src/locale/pl/_lib/localize/index.js @@ -17,7 +17,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return String(number) } diff --git a/src/locale/pt-BR/_lib/localize/index.js b/src/locale/pt-BR/_lib/localize/index.js index 0890f2925c..8424a480f1 100644 --- a/src/locale/pt-BR/_lib/localize/index.js +++ b/src/locale/pt-BR/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber, dirtyOptions) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var options = dirtyOptions || {} var unit = String(options.unit) diff --git a/src/locale/pt/_lib/localize/index.js b/src/locale/pt/_lib/localize/index.js index 6e6c760a69..2c111b0d59 100644 --- a/src/locale/pt/_lib/localize/index.js +++ b/src/locale/pt/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + 'º' } diff --git a/src/locale/ro/_lib/localize/index.js b/src/locale/ro/_lib/localize/index.js index aa3befa0b1..01df4ae782 100644 --- a/src/locale/ro/_lib/localize/index.js +++ b/src/locale/ro/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return String(number) } diff --git a/src/locale/ru/_lib/localize/index.js b/src/locale/ru/_lib/localize/index.js index 72ff028745..72eb759b75 100644 --- a/src/locale/ru/_lib/localize/index.js +++ b/src/locale/ru/_lib/localize/index.js @@ -123,7 +123,7 @@ var localize = { values: quarterValues, defaultWidth: 'wide', argumentCallback: function (quarter) { - return Number(quarter) - 1 + return Math.trunc(Number(quarter)) - 1 } }), diff --git a/src/locale/sk/_lib/localize/index.js b/src/locale/sk/_lib/localize/index.js index e79883d6b9..d40e33f745 100644 --- a/src/locale/sk/_lib/localize/index.js +++ b/src/locale/sk/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } diff --git a/src/locale/sr/_lib/localize/index.js b/src/locale/sr/_lib/localize/index.js index ac55407f6b..8c82408c0b 100644 --- a/src/locale/sr/_lib/localize/index.js +++ b/src/locale/sr/_lib/localize/index.js @@ -17,7 +17,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number + '.' } diff --git a/src/locale/sv/_lib/localize/index.js b/src/locale/sv/_lib/localize/index.js index 425395c457..c6e535c236 100644 --- a/src/locale/sv/_lib/localize/index.js +++ b/src/locale/sv/_lib/localize/index.js @@ -59,7 +59,7 @@ var dayPeriodValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) var rem100 = number % 100 if (rem100 > 20 || rem100 < 10) { @@ -84,7 +84,7 @@ var localize = { values: quarterValues, defaultWidth: 'wide', argumentCallback: function (quarter) { - return Number(quarter) - 1 + return Math.trunc(Number(quarter)) - 1 } }), diff --git a/src/locale/th/_lib/localize/index.js b/src/locale/th/_lib/localize/index.js index c22f850cca..23aa77f20f 100644 --- a/src/locale/th/_lib/localize/index.js +++ b/src/locale/th/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return number } diff --git a/src/locale/tr/_lib/localize/index.js b/src/locale/tr/_lib/localize/index.js index ee1f2d0686..bd01536906 100644 --- a/src/locale/tr/_lib/localize/index.js +++ b/src/locale/tr/_lib/localize/index.js @@ -44,7 +44,7 @@ var ordinalNumberSuffixes = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) if (number === 0) { return "0'ıncı" diff --git a/src/locale/zh-CN/_lib/localize/index.js b/src/locale/zh-CN/_lib/localize/index.js index 5aa1b665af..12ed046998 100644 --- a/src/locale/zh-CN/_lib/localize/index.js +++ b/src/locale/zh-CN/_lib/localize/index.js @@ -17,7 +17,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return String(number) } diff --git a/src/locale/zh-TW/_lib/localize/index.js b/src/locale/zh-TW/_lib/localize/index.js index 6b13b847b4..3cb76ef09e 100644 --- a/src/locale/zh-TW/_lib/localize/index.js +++ b/src/locale/zh-TW/_lib/localize/index.js @@ -19,7 +19,7 @@ var timeOfDayValues = { } function ordinalNumber (dirtyNumber) { - var number = Number(dirtyNumber) + var number = Math.trunc(Number(dirtyNumber)) return String(number) } diff --git a/src/parse/index.js b/src/parse/index.js index 05c24a413e..88011ad21d 100644 --- a/src/parse/index.js +++ b/src/parse/index.js @@ -304,11 +304,11 @@ export default function parse (dirtyDateString, dirtyFormatString, dirtyBaseDate var defaultFirstWeekContainsDate = localeFirstWeekContainsDate === undefined ? 1 - : Number(localeFirstWeekContainsDate) + : Math.trunc(Number(localeFirstWeekContainsDate)) var firstWeekContainsDate = options.firstWeekContainsDate === undefined ? defaultFirstWeekContainsDate - : Number(options.firstWeekContainsDate) + : Math.trunc(Number(options.firstWeekContainsDate)) // Test if weekStartsOn is between 1 and 7 _and_ is not NaN if (!(firstWeekContainsDate >= 1 && firstWeekContainsDate <= 7)) { @@ -316,8 +316,8 @@ export default function parse (dirtyDateString, dirtyFormatString, dirtyBaseDate } var localeWeekStartsOn = locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { diff --git a/src/setDate/index.js b/src/setDate/index.js index 5a84664764..8da0e27cf8 100644 --- a/src/setDate/index.js +++ b/src/setDate/index.js @@ -27,7 +27,7 @@ export default function setDate (dirtyDate, dirtyDayOfMonth, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var dayOfMonth = Number(dirtyDayOfMonth) + var dayOfMonth = Math.trunc(Number(dirtyDayOfMonth)) date.setDate(dayOfMonth) return date } diff --git a/src/setDay/index.js b/src/setDay/index.js index cd976e87f4..811a623270 100644 --- a/src/setDay/index.js +++ b/src/setDay/index.js @@ -38,8 +38,8 @@ export default function setDay (dirtyDate, dirtyDay, dirtyOptions) { var options = dirtyOptions || {} var locale = options.locale var localeWeekStartsOn = locale && locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { @@ -47,7 +47,7 @@ export default function setDay (dirtyDate, dirtyDay, dirtyOptions) { } var date = toDate(dirtyDate, options) - var day = Number(dirtyDay) + var day = Math.trunc(Number(dirtyDay)) var currentDay = date.getDay() var remainder = day % 7 diff --git a/src/setDayOfYear/index.js b/src/setDayOfYear/index.js index 1a999d5fff..7f8b302a19 100644 --- a/src/setDayOfYear/index.js +++ b/src/setDayOfYear/index.js @@ -27,7 +27,7 @@ export default function setDayOfYear (dirtyDate, dirtyDayOfYear, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var dayOfYear = Number(dirtyDayOfYear) + var dayOfYear = Math.trunc(Number(dirtyDayOfYear)) date.setMonth(0) date.setDate(dayOfYear) return date diff --git a/src/setHours/index.js b/src/setHours/index.js index e7b45f96a8..b59bae9a7d 100644 --- a/src/setHours/index.js +++ b/src/setHours/index.js @@ -27,7 +27,7 @@ export default function setHours (dirtyDate, dirtyHours, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var hours = Number(dirtyHours) + var hours = Math.trunc(Number(dirtyHours)) date.setHours(hours) return date } diff --git a/src/setISODay/index.js b/src/setISODay/index.js index 6a4ee50e9d..90e55abf6e 100644 --- a/src/setISODay/index.js +++ b/src/setISODay/index.js @@ -31,7 +31,7 @@ export default function setISODay (dirtyDate, dirtyDay, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var day = Number(dirtyDay) + var day = Math.trunc(Number(dirtyDay)) var currentDay = getISODay(date, dirtyOptions) var diff = day - currentDay return addDays(date, diff, dirtyOptions) diff --git a/src/setISOWeek/index.js b/src/setISOWeek/index.js index 61afd0159c..6f7dbf4703 100644 --- a/src/setISOWeek/index.js +++ b/src/setISOWeek/index.js @@ -30,7 +30,7 @@ export default function setISOWeek (dirtyDate, dirtyISOWeek, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var isoWeek = Number(dirtyISOWeek) + var isoWeek = Math.trunc(Number(dirtyISOWeek)) var diff = getISOWeek(date, dirtyOptions) - isoWeek date.setDate(date.getDate() - diff * 7) return date diff --git a/src/setISOWeekYear/index.js b/src/setISOWeekYear/index.js index 7cefcfecd5..f4fdd45c8c 100644 --- a/src/setISOWeekYear/index.js +++ b/src/setISOWeekYear/index.js @@ -32,7 +32,7 @@ export default function setISOWeekYear (dirtyDate, dirtyISOWeekYear, dirtyOption } var date = toDate(dirtyDate, dirtyOptions) - var isoWeekYear = Number(dirtyISOWeekYear) + var isoWeekYear = Math.trunc(Number(dirtyISOWeekYear)) var diff = differenceInCalendarDays(date, startOfISOWeekYear(date, dirtyOptions), dirtyOptions) var fourthOfJanuary = new Date(0) fourthOfJanuary.setFullYear(isoWeekYear, 0, 4) diff --git a/src/setMilliseconds/index.js b/src/setMilliseconds/index.js index 261f57c0bd..b116eb3c3c 100644 --- a/src/setMilliseconds/index.js +++ b/src/setMilliseconds/index.js @@ -27,7 +27,7 @@ export default function setMilliseconds (dirtyDate, dirtyMilliseconds, dirtyOpti } var date = toDate(dirtyDate, dirtyOptions) - var milliseconds = Number(dirtyMilliseconds) + var milliseconds = Math.trunc(Number(dirtyMilliseconds)) date.setMilliseconds(milliseconds) return date } diff --git a/src/setMinutes/index.js b/src/setMinutes/index.js index 90b091e1b8..cd801bfd7d 100644 --- a/src/setMinutes/index.js +++ b/src/setMinutes/index.js @@ -27,7 +27,7 @@ export default function setMinutes (dirtyDate, dirtyMinutes, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var minutes = Number(dirtyMinutes) + var minutes = Math.trunc(Number(dirtyMinutes)) date.setMinutes(minutes) return date } diff --git a/src/setMonth/index.js b/src/setMonth/index.js index 5ec9265c57..f9358acac4 100644 --- a/src/setMonth/index.js +++ b/src/setMonth/index.js @@ -28,7 +28,7 @@ export default function setMonth (dirtyDate, dirtyMonth, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var month = Number(dirtyMonth) + var month = Math.trunc(Number(dirtyMonth)) var year = date.getFullYear() var day = date.getDate() diff --git a/src/setQuarter/index.js b/src/setQuarter/index.js index 6954e87890..b0ea1de999 100644 --- a/src/setQuarter/index.js +++ b/src/setQuarter/index.js @@ -28,7 +28,7 @@ export default function setQuarter (dirtyDate, dirtyQuarter, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var quarter = Number(dirtyQuarter) + var quarter = Math.trunc(Number(dirtyQuarter)) var oldQuarter = Math.floor(date.getMonth() / 3) + 1 var diff = quarter - oldQuarter return setMonth(date, date.getMonth() + diff * 3, dirtyOptions) diff --git a/src/setSeconds/index.js b/src/setSeconds/index.js index e3d87d5d25..920bf23cb7 100644 --- a/src/setSeconds/index.js +++ b/src/setSeconds/index.js @@ -27,7 +27,7 @@ export default function setSeconds (dirtyDate, dirtySeconds, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var seconds = Number(dirtySeconds) + var seconds = Math.trunc(Number(dirtySeconds)) date.setSeconds(seconds) return date } diff --git a/src/setWeek/index.js b/src/setWeek/index.js index 471951d0a2..d652a8bf9e 100644 --- a/src/setWeek/index.js +++ b/src/setWeek/index.js @@ -45,7 +45,7 @@ export default function setWeek (dirtyDate, dirtyWeek, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var week = Number(dirtyWeek) + var week = Math.trunc(Number(dirtyWeek)) var diff = getWeek(date, dirtyOptions) - week date.setDate(date.getDate() - diff * 7) return date diff --git a/src/setWeekYear/index.js b/src/setWeekYear/index.js index 88a993e9e3..8d4d2f0a63 100644 --- a/src/setWeekYear/index.js +++ b/src/setWeekYear/index.js @@ -54,14 +54,14 @@ export default function setWeekYear (dirtyDate, dirtyWeekYear, dirtyOptions) { var defaultFirstWeekContainsDate = localeFirstWeekContainsDate === undefined ? 1 - : Number(localeFirstWeekContainsDate) + : Math.trunc(Number(localeFirstWeekContainsDate)) var firstWeekContainsDate = options.firstWeekContainsDate === undefined ? defaultFirstWeekContainsDate - : Number(options.firstWeekContainsDate) + : Math.trunc(Number(options.firstWeekContainsDate)) var date = toDate(dirtyDate, dirtyOptions) - var weekYear = Number(dirtyWeekYear) + var weekYear = Math.trunc(Number(dirtyWeekYear)) var diff = differenceInCalendarDays(date, startOfWeekYear(date, dirtyOptions), dirtyOptions) var firstWeek = new Date(0) firstWeek.setFullYear(weekYear, 0, firstWeekContainsDate) diff --git a/src/setYear/index.js b/src/setYear/index.js index bef79e3996..d55d00596b 100644 --- a/src/setYear/index.js +++ b/src/setYear/index.js @@ -27,7 +27,7 @@ export default function setYear (dirtyDate, dirtyYear, dirtyOptions) { } var date = toDate(dirtyDate, dirtyOptions) - var year = Number(dirtyYear) + var year = Math.trunc(Number(dirtyYear)) // Check if date is Invalid Date because Date.prototype.setFullYear ignores the value of Invalid Date if (isNaN(date)) { diff --git a/src/startOfWeek/index.js b/src/startOfWeek/index.js index 434a6ab723..25ccb00009 100644 --- a/src/startOfWeek/index.js +++ b/src/startOfWeek/index.js @@ -37,8 +37,8 @@ export default function startOfWeek (dirtyDate, dirtyOptions) { var options = dirtyOptions || {} var locale = options.locale var localeWeekStartsOn = locale && locale.options && locale.options.weekStartsOn - var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Number(localeWeekStartsOn) - var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Number(options.weekStartsOn) + var defaultWeekStartsOn = localeWeekStartsOn === undefined ? 0 : Math.trunc(Number(localeWeekStartsOn)) + var weekStartsOn = options.weekStartsOn === undefined ? defaultWeekStartsOn : Math.trunc(Number(options.weekStartsOn)) // Test if weekStartsOn is between 0 and 6 _and_ is not NaN if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) { diff --git a/src/startOfWeekYear/index.js b/src/startOfWeekYear/index.js index f9f215b3a9..efbb780661 100644 --- a/src/startOfWeekYear/index.js +++ b/src/startOfWeekYear/index.js @@ -51,11 +51,11 @@ export default function startOfWeekYear (dirtyDate, dirtyOptions) { var defaultFirstWeekContainsDate = localeFirstWeekContainsDate === undefined ? 1 - : Number(localeFirstWeekContainsDate) + : Math.trunc(Number(localeFirstWeekContainsDate)) var firstWeekContainsDate = options.firstWeekContainsDate === undefined ? defaultFirstWeekContainsDate - : Number(options.firstWeekContainsDate) + : Math.trunc(Number(options.firstWeekContainsDate)) var year = getWeekYear(dirtyDate, dirtyOptions) var firstWeek = new Date(0) diff --git a/src/subDays/index.js b/src/subDays/index.js index e5f9954e6e..6bde9371f4 100644 --- a/src/subDays/index.js +++ b/src/subDays/index.js @@ -26,6 +26,6 @@ export default function subDays (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addDays(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subHours/index.js b/src/subHours/index.js index 19cea6d03b..be536a5d64 100644 --- a/src/subHours/index.js +++ b/src/subHours/index.js @@ -26,6 +26,6 @@ export default function subHours (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addHours(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subISOWeekYears/index.js b/src/subISOWeekYears/index.js index 3117084e30..e4b3b9ea61 100644 --- a/src/subISOWeekYears/index.js +++ b/src/subISOWeekYears/index.js @@ -28,6 +28,6 @@ export default function subISOWeekYears (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addISOWeekYears(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subMilliseconds/index.js b/src/subMilliseconds/index.js index 230acac836..9066416901 100644 --- a/src/subMilliseconds/index.js +++ b/src/subMilliseconds/index.js @@ -26,6 +26,6 @@ export default function subMilliseconds (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addMilliseconds(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subMinutes/index.js b/src/subMinutes/index.js index 15f4f4dbf6..cd6dd82d18 100644 --- a/src/subMinutes/index.js +++ b/src/subMinutes/index.js @@ -26,6 +26,6 @@ export default function subMinutes (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addMinutes(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subMonths/index.js b/src/subMonths/index.js index cd959223a5..3c5c5c332d 100644 --- a/src/subMonths/index.js +++ b/src/subMonths/index.js @@ -26,6 +26,6 @@ export default function subMonths (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addMonths(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subQuarters/index.js b/src/subQuarters/index.js index 8a04578002..992f5f76e6 100644 --- a/src/subQuarters/index.js +++ b/src/subQuarters/index.js @@ -26,6 +26,6 @@ export default function subQuarters (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addQuarters(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subSeconds/index.js b/src/subSeconds/index.js index 8b4261bac2..3216d1e431 100644 --- a/src/subSeconds/index.js +++ b/src/subSeconds/index.js @@ -26,6 +26,6 @@ export default function subSeconds (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addSeconds(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subWeeks/index.js b/src/subWeeks/index.js index 9457ac860f..d584307876 100644 --- a/src/subWeeks/index.js +++ b/src/subWeeks/index.js @@ -26,6 +26,6 @@ export default function subWeeks (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addWeeks(dirtyDate, -amount, dirtyOptions) } diff --git a/src/subYears/index.js b/src/subYears/index.js index e55cf4b708..662b58b37a 100644 --- a/src/subYears/index.js +++ b/src/subYears/index.js @@ -26,6 +26,6 @@ export default function subYears (dirtyDate, dirtyAmount, dirtyOptions) { throw new TypeError('2 arguments required, but only ' + arguments.length + ' present') } - var amount = Number(dirtyAmount) + var amount = Math.trunc(Number(dirtyAmount)) return addYears(dirtyDate, -amount, dirtyOptions) } diff --git a/src/toDate/index.js b/src/toDate/index.js index 2d31ba6eae..641576ff04 100644 --- a/src/toDate/index.js +++ b/src/toDate/index.js @@ -90,7 +90,7 @@ export default function toDate (argument, dirtyOptions) { var options = dirtyOptions || {} - var additionalDigits = options.additionalDigits === undefined ? DEFAULT_ADDITIONAL_DIGITS : Number(options.additionalDigits) + var additionalDigits = options.additionalDigits === undefined ? DEFAULT_ADDITIONAL_DIGITS : Math.trunc(Number(options.additionalDigits)) if (additionalDigits !== 2 && additionalDigits !== 1 && additionalDigits !== 0) { throw new RangeError('additionalDigits must be 0, 1 or 2') }