From 9457642473d3e282310a829754929463e6998941 Mon Sep 17 00:00:00 2001 From: idrisakmal Date: Tue, 26 Jun 2018 17:22:50 +0800 Subject: [PATCH 1/3] Created includes function for array to cater older browsers --- src/lib/isDecimal.js | 3 ++- src/lib/isISO31661Alpha2.js | 5 +++-- src/lib/isISO31661Alpha3.js | 3 ++- src/lib/util/includes.js | 5 +++++ 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 src/lib/util/includes.js diff --git a/src/lib/isDecimal.js b/src/lib/isDecimal.js index f3f5734c2..488668a52 100644 --- a/src/lib/isDecimal.js +++ b/src/lib/isDecimal.js @@ -1,5 +1,6 @@ import merge from './util/merge'; import assertString from './util/assertString'; +import includes from './util/includes'; import { decimal } from './alpha'; function decimalRegExp(options) { @@ -19,7 +20,7 @@ export default function isDecimal(str, options) { assertString(str); options = merge(options, default_decimal_options); if (options.locale in decimal) { - return !blacklist.includes(str.replace(/ /g, '')) && decimalRegExp(options).test(str); + return !includes(blacklist, str.replace(/ /g, '')) && decimalRegExp(options).test(str); } throw new Error(`Invalid locale '${options.locale}'`); } diff --git a/src/lib/isISO31661Alpha2.js b/src/lib/isISO31661Alpha2.js index af0faf2b6..f43439f00 100644 --- a/src/lib/isISO31661Alpha2.js +++ b/src/lib/isISO31661Alpha2.js @@ -1,4 +1,5 @@ import assertString from './util/assertString'; +import includes from './util/includes'; // from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 const validISO31661Alpha2CountriesCodes = [ @@ -31,5 +32,5 @@ const validISO31661Alpha2CountriesCodes = [ export default function isISO31661Alpha2(str) { assertString(str); - return validISO31661Alpha2CountriesCodes.includes(str.toUpperCase()); -} + return includes(validISO31661Alpha2CountriesCodes, str.toUpperCase()) +} \ No newline at end of file diff --git a/src/lib/isISO31661Alpha3.js b/src/lib/isISO31661Alpha3.js index 46aa981ba..00c3dfb14 100644 --- a/src/lib/isISO31661Alpha3.js +++ b/src/lib/isISO31661Alpha3.js @@ -1,4 +1,5 @@ import assertString from './util/assertString'; +import includes from './util/includes'; // from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3 const validISO31661Alpha3CountriesCodes = [ @@ -22,5 +23,5 @@ const validISO31661Alpha3CountriesCodes = [ export default function isISO31661Alpha3(str) { assertString(str); - return validISO31661Alpha3CountriesCodes.includes(str.toUpperCase()); + return includes(validISO31661Alpha3CountriesCodes, str.toUpperCase()); } diff --git a/src/lib/util/includes.js b/src/lib/util/includes.js new file mode 100644 index 000000000..b7159e8d2 --- /dev/null +++ b/src/lib/util/includes.js @@ -0,0 +1,5 @@ +export default (array, ele) => { + return array.some(element => { + element === ele + }) +} \ No newline at end of file From ac047562a6a2899fda8aae49f1de9bf14738ba69 Mon Sep 17 00:00:00 2001 From: idrisakmal Date: Wed, 27 Jun 2018 16:26:10 +0800 Subject: [PATCH 2/3] Fixed stuff using eslint --- src/lib/util/includes.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/util/includes.js b/src/lib/util/includes.js index b7159e8d2..70ace8857 100644 --- a/src/lib/util/includes.js +++ b/src/lib/util/includes.js @@ -1,5 +1,3 @@ -export default (array, ele) => { - return array.some(element => { - element === ele - }) -} \ No newline at end of file +const includes = (arr, val) => arr.some(arrVal => val === arrVal); + +export default includes; From f6306972ae9c5f5515ddfd0ccda64db40fd5002b Mon Sep 17 00:00:00 2001 From: idrisakmal Date: Wed, 27 Jun 2018 16:33:36 +0800 Subject: [PATCH 3/3] Fixed semicolon issue --- src/lib/isISO31661Alpha2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/isISO31661Alpha2.js b/src/lib/isISO31661Alpha2.js index f43439f00..ee1c33a40 100644 --- a/src/lib/isISO31661Alpha2.js +++ b/src/lib/isISO31661Alpha2.js @@ -32,5 +32,5 @@ const validISO31661Alpha2CountriesCodes = [ export default function isISO31661Alpha2(str) { assertString(str); - return includes(validISO31661Alpha2CountriesCodes, str.toUpperCase()) -} \ No newline at end of file + return includes(validISO31661Alpha2CountriesCodes, str.toUpperCase()); +}