Skip to content

Commit

Permalink
Truncate all number arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
leshakoss committed May 25, 2018
1 parent 136d623 commit 2d2f2fe
Show file tree
Hide file tree
Showing 92 changed files with 120 additions and 120 deletions.
4 changes: 2 additions & 2 deletions docs/i18nContributionGuide.md
Expand Up @@ -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) {
Expand Down Expand Up @@ -320,7 +320,7 @@ var localize = {
values: quarterValues,
defaultWidth: 'wide',
argumentCallback: function (quarter) {
return Number(quarter) - 1
return Math.trunc(Number(quarter)) - 1
}
}),
// ...
Expand Down
2 changes: 1 addition & 1 deletion src/_lib/addUTCMinutes/index.js
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions src/_lib/getUTCWeekYear/index.js
Expand Up @@ -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)) {
Expand Down
6 changes: 3 additions & 3 deletions src/_lib/setUTCDay/index.js
Expand Up @@ -10,16 +10,16 @@ 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)) {
throw new RangeError('weekStartsOn must be between 0 and 6 inclusively')
}

var date = toDate(dirtyDate, dirtyOptions)
var day = Number(dirtyDay)
var day = Math.trunc(Number(dirtyDay))

var currentDay = date.getUTCDay()

Expand Down
2 changes: 1 addition & 1 deletion src/_lib/setUTCISODay/index.js
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/_lib/setUTCISOWeek/index.js
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/_lib/setUTCWeek/index.js
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/_lib/startOfUTCWeek/index.js
Expand Up @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions src/_lib/startOfUTCWeekYear/index.js
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/addDays/index.js
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion src/addHours/index.js
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion src/addISOWeekYears/index.js
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion src/addMilliseconds/index.js
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion src/addMinutes/index.js
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion src/addMonths/index.js
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/addQuarters/index.js
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion src/addSeconds/index.js
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion src/addWeeks/index.js
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion src/addYears/index.js
Expand Up @@ -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)
}
4 changes: 2 additions & 2 deletions src/endOfWeek/index.js
Expand Up @@ -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)) {
Expand Down
8 changes: 4 additions & 4 deletions src/format/index.js
Expand Up @@ -321,20 +321,20 @@ 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)) {
throw new RangeError('firstWeekContainsDate must be between 1 and 7 inclusively')
}

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)) {
Expand Down
4 changes: 2 additions & 2 deletions src/getWeekOfMonth/index.js
Expand Up @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions src/getWeekYear/index.js
Expand Up @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions src/lastDayOfWeek/index.js
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion src/locale/af/_lib/localize/index.js
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/locale/bg/_lib/localize/index.js
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/locale/ca/_lib/localize/index.js
Expand Up @@ -19,7 +19,7 @@ var timeOfDayValues = {
}

function ordinalNumber (dirtyNumber) {
var number = Number(dirtyNumber)
var number = Math.trunc(Number(dirtyNumber))

switch (number) {
case 1:
Expand Down
2 changes: 1 addition & 1 deletion src/locale/cs/_lib/localize/index.js
Expand Up @@ -19,7 +19,7 @@ var timeOfDayValues = {
}

function ordinalNumber (dirtyNumber) {
var number = Number(dirtyNumber)
var number = Math.trunc(Number(dirtyNumber))
return number + '.'
}

Expand Down
2 changes: 1 addition & 1 deletion src/locale/da/_lib/localize/index.js
Expand Up @@ -19,7 +19,7 @@ var timeOfDayValues = {
}

function ordinalNumber (dirtyNumber) {
var number = Number(dirtyNumber)
var number = Math.trunc(Number(dirtyNumber))
return number + '.'
}

Expand Down
2 changes: 1 addition & 1 deletion src/locale/de/_lib/localize/index.js
Expand Up @@ -23,7 +23,7 @@ var timeOfDayValues = {
}

function ordinalNumber (dirtyNumber) {
var number = Number(dirtyNumber)
var number = Math.trunc(Number(dirtyNumber))
return number + '.'
}

Expand Down
2 changes: 1 addition & 1 deletion src/locale/el/_lib/localize/index.js
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/locale/en-US/_lib/localize/index.js
Expand Up @@ -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,
Expand Down Expand Up @@ -101,7 +101,7 @@ var localize = {
values: quarterValues,
defaultWidth: 'wide',
argumentCallback: function (quarter) {
return Number(quarter) - 1
return Math.trunc(Number(quarter)) - 1
}
}),

Expand Down
4 changes: 2 additions & 2 deletions src/locale/eo/_lib/localize/index.js
Expand Up @@ -59,7 +59,7 @@ var dayPeriodValues = {
}

function ordinalNumber (dirtyNumber) {
var number = Number(dirtyNumber)
var number = Math.trunc(Number(dirtyNumber))
return number + '-a'
}

Expand All @@ -75,7 +75,7 @@ var localize = {
values: quarterValues,
defaultWidth: 'wide',
argumentCallback: function (quarter) {
return Number(quarter) - 1
return Math.trunc(Number(quarter)) - 1
}
}),

Expand Down
2 changes: 1 addition & 1 deletion src/locale/es/_lib/localize/index.js
Expand Up @@ -19,7 +19,7 @@ var timeOfDayValues = {
}

function ordinalNumber (dirtyNumber) {
var number = Number(dirtyNumber)
var number = Math.trunc(Number(dirtyNumber))
return number + 'º'
}

Expand Down
2 changes: 1 addition & 1 deletion src/locale/et/_lib/localize/index.js
Expand Up @@ -19,7 +19,7 @@ var timeOfDayValues = {
}

function ordinalNumber (dirtyNumber) {
var number = Number(dirtyNumber)
var number = Math.trunc(Number(dirtyNumber))
return number + '.'
}

Expand Down
2 changes: 1 addition & 1 deletion src/locale/fi/_lib/localize/index.js
Expand Up @@ -19,7 +19,7 @@ var timeOfDayValues = {
}

function ordinalNumber (dirtyNumber) {
var number = Number(dirtyNumber)
var number = Math.trunc(Number(dirtyNumber))
return number + '.'
}

Expand Down

0 comments on commit 2d2f2fe

Please sign in to comment.