From e45843c71c73511ba0f499053184883ddc28f990 Mon Sep 17 00:00:00 2001 From: Morgan Harris Date: Wed, 24 Nov 2021 11:35:39 +1100 Subject: Allow access to original Array.prototype methods on List prefixed with $ --- spec/spec/types/List.js | 14 ++++++++++++++ src/types/List.js | 5 +++++ 2 files changed, 19 insertions(+) diff --git a/spec/spec/types/List.js b/spec/spec/types/List.js index eb0b40b..9fd27db 100644 --- a/spec/spec/types/List.js +++ b/spec/spec/types/List.js @@ -71,6 +71,20 @@ describe('List.js', () => { delete List.prototype.fooBar }) + it('keeps Array prototype names prefixed with $', () => { + // We're picking a function that we know isn't part of core svg.js + // If we implement an 'unshift' function at some point, change this to something else + if (List.prototype.hasOwnProperty('unshift')) { + fail('List.unshift is already a function - change this test to use a different name!'); + return; + } + + List.extend([ 'unshift' ]) + expect(new List().unshift).toEqual(any(Function)) + expect(new List().$unshift).toEqual(Array.prototype.unshift) + delete List.prototype.unshift; + }); + it('skips reserved names', () => { const { constructor, each, toArray } = List.prototype List.extend([ 'constructor', 'each', 'toArray' ]) diff --git a/src/types/List.js b/src/types/List.js index 197a155..97536ed 100644 --- a/src/types/List.js +++ b/src/types/List.js @@ -47,6 +47,11 @@ List.extend = function (methods) { // Don't add private methods if (name[0] === '_') return obj + // Allow access to original Array methods through a prefix + if (name in Array.prototype) { + obj['$' + name] = Array.prototype[name] + } + // Relay every call to each() obj[name] = function (...attrs) { return this.each(name, ...attrs) -- cgit v1.2.3 From bb8b54a3bbe415f1ca6c9fbe917604adb16b53ad Mon Sep 17 00:00:00 2001 From: Morgan Harris Date: Wed, 24 Nov 2021 11:47:42 +1100 Subject: Add a test to check that the new and original methods both work --- spec/spec/types/List.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spec/spec/types/List.js b/spec/spec/types/List.js index 9fd27db..21f9cb2 100644 --- a/spec/spec/types/List.js +++ b/spec/spec/types/List.js @@ -82,6 +82,21 @@ describe('List.js', () => { List.extend([ 'unshift' ]) expect(new List().unshift).toEqual(any(Function)) expect(new List().$unshift).toEqual(Array.prototype.unshift) + + // Check that it works! + const sourceArray = [ + { 'unshift': () => 1 }, + { 'unshift': () => 2 }, + { 'unshift': () => 3 } + ]; + const list = new List(sourceArray) + + expect(list).toEqual(sourceArray) + expect(list.unshift(0)).toEqual([1,2,3]) + + expect(list.$unshift(0)).toEqual(4) + expect(list).toEqual([0].concat(sourceArray)) + delete List.prototype.unshift; }); -- cgit v1.2.3