Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX release] Fixes isEmpty for non-Ember.Map object with size property #14928

Closed
wants to merge 2 commits into from
Closed

[BUGFIX release] Fixes isEmpty for non-Ember.Map object with size property #14928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df77abe
[BUGFIX release] Fixes `isEmpty` when passed a non Ember.Map object w…
locks Feb 13, 2017
1a953c4
Update is_empty_test.js
locks Feb 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/ember-metal/lib/is_empty.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { get } from './property_get';
import isNone from './is_none';
import EmberMap from './map';

/**
Verifies that a value is `null` or an empty string, empty array,
Expand Down Expand Up @@ -39,7 +40,7 @@ export default function isEmpty(obj) {

let objectType = typeof obj;

if (objectType === 'object') {
if (objectType instanceof EmberMap) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this matters, but this would not work if 2 embers where present on the same page. As there would be two different EmberMap and the isEmpty of one, could not work with the other.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix for this, would be to add some property to EmberMap that we can check (e.g. obj.isEmberMap or obj[SOME_PRIVATE_EMBER_MAP_SYMBOL_THINGY] depending on how paranoid we want to be)...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for letting this slide. What's the call here? Will investigate CI failure.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lock I think the private, non-enumerable symbol would be the correct path.

let size = get(obj, 'size');
if (typeof size === 'number') {
return !size;
Expand Down
7 changes: 7 additions & 0 deletions packages/ember-metal/tests/is_empty_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ QUnit.test('Ember.isEmpty Ember.Map', function() {
equal(false, isEmpty(map), 'Map is not empty');
});

QUnit.test('Ember.isEmpty Object with size property', function() {
let obj = { size: 0 };
equal(false, isEmpty(obj), 'Object is empty');
obj.size = 1;
equal(false, isEmpty(obj), 'Object is empty');
});

QUnit.test('Ember.isEmpty Ember.OrderedSet', function() {
let orderedSet = new OrderedSet();
equal(true, isEmpty(orderedSet), 'Empty ordered set is empty');
Expand Down