Skip to content

Commit

Permalink
Merge pull request #17238 from pzuraq/bugfix/ensure-array-wrapper-is-…
Browse files Browse the repository at this point in the history
…a-constructor

[BUGFIX beta] Ensures Ember.A is a constructor
  • Loading branch information
rwjblue authored Nov 30, 2018
2 parents ad06dad + 5a565d5 commit e329e3f
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 2 deletions.
28 changes: 26 additions & 2 deletions packages/@ember/-internals/runtime/lib/mixins/array.js
Original file line number Diff line number Diff line change
Expand Up @@ -1641,12 +1641,36 @@ let A;

if (ENV.EXTEND_PROTOTYPES.Array) {
NativeArray.apply(Array.prototype);
A = arr => arr || [];

A = function(arr) {
deprecate(
'`new A()` has been deprecated, please update to calling A as a function: `A()`',
!(this instanceof A),
{
id: 'array.new-array-wrapper',
until: '3.9.0',
url: 'https://emberjs.com/deprecations/v3.x#toc_array-new-array-wrapper',
}
);

return arr || [];
};
} else {
A = arr => {
A = function(arr) {
deprecate(
'`new A()` has been deprecated, please update to calling A as a function: `A()`',
!(this instanceof A),
{
id: 'array.new-array-wrapper',
until: '3.9.0',
url: 'https://emberjs.com/deprecations/v3.x#toc_array-new-array-wrapper',
}
);

if (!arr) {
arr = [];
}

return ArrayMixin.detect(arr) ? arr : NativeArray.apply(arr);
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,15 @@ moduleFor(
assert.ok(EmberArray.detect(A()), 'returned an ember array');
assert.ok(EmberArray.detect(A([1, 2])), 'returned an ember array');
}

['@test new Ember.A'](assert) {
expectDeprecation(() => {
assert.deepEqual(new A([1, 2]), [1, 2], 'array values were not be modified');
assert.deepEqual(new A(), [], 'returned an array with no arguments');
assert.deepEqual(new A(null), [], 'returned an array with a null argument');
assert.ok(EmberArray.detect(new A()), 'returned an ember array');
assert.ok(EmberArray.detect(new A([1, 2])), 'returned an ember array');
});
}
}
);

0 comments on commit e329e3f

Please sign in to comment.