From f4c6253a046b8a6a3c3e8e7e7d8aa99fd67ac492 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Wed, 14 Feb 2018 08:27:55 -0600 Subject: [PATCH] Add Array includes polyfill --- Gruntfile.js | 2 +- app/assets/javascripts/app/app.js | 52 ++++++++++++++++++++++++++++ public/extensions/extensions-manager | 2 +- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6878b6524..8a1b78e12 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,7 +13,7 @@ module.exports = function(grunt) { js: { files: ['app/assets/javascripts/**/*.js'], - tasks: [ 'concat:app', 'babel', 'browserify', 'concat:dist'], + tasks: [ 'concat:app', 'babel', 'browserify', 'concat:dist', 'ngAnnotate'], options: { spawn: false, }, diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js index af4ac2d2e..4fc96cf34 100644 --- a/app/assets/javascripts/app/app.js +++ b/app/assets/javascripts/app/app.js @@ -50,3 +50,55 @@ Array.prototype.containsPrimitiveSubset = function(array) { Array.prototype.containsObjectSubset = function(array) { return !array.some(val => !_.find(this, val)); } + +// https://tc39.github.io/ecma262/#sec-array.prototype.includes +if (!Array.prototype.includes) { + Object.defineProperty(Array.prototype, 'includes', { + value: function(searchElement, fromIndex) { + + if (this == null) { + throw new TypeError('"this" is null or not defined'); + } + + // 1. Let O be ? ToObject(this value). + var o = Object(this); + + // 2. Let len be ? ToLength(? Get(O, "length")). + var len = o.length >>> 0; + + // 3. If len is 0, return false. + if (len === 0) { + return false; + } + + // 4. Let n be ? ToInteger(fromIndex). + // (If fromIndex is undefined, this step produces the value 0.) + var n = fromIndex | 0; + + // 5. If n ≥ 0, then + // a. Let k be n. + // 6. Else n < 0, + // a. Let k be len + n. + // b. If k < 0, let k be 0. + var k = Math.max(n >= 0 ? n : len - Math.abs(n), 0); + + function sameValueZero(x, y) { + return x === y || (typeof x === 'number' && typeof y === 'number' && isNaN(x) && isNaN(y)); + } + + // 7. Repeat, while k < len + while (k < len) { + // a. Let elementK be the result of ? Get(O, ! ToString(k)). + // b. If SameValueZero(searchElement, elementK) is true, return true. + if (sameValueZero(o[k], searchElement)) { + return true; + } + // c. Increase k by 1. + k++; + } + + // 8. Return false + return false; + } + }); +} diff --git a/public/extensions/extensions-manager b/public/extensions/extensions-manager index 3bfd3c1b4..8a7b660e5 160000 --- a/public/extensions/extensions-manager +++ b/public/extensions/extensions-manager @@ -1 +1 @@ -Subproject commit 3bfd3c1b4fb1225fe6b063eacc51cc05697f47a8 +Subproject commit 8a7b660e50475add9d3993943602e86e5dcb05df