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

Make computed.or and computed.and return truthy values #10254

Merged
merged 2 commits into from
Jan 21, 2015
Merged

Make computed.or and computed.and return truthy values #10254

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
0a23335
Make computed and/or more like && and ||
soulcutter Jan 21, 2015
e4392eb
Deprecate computed.any in favor of computed.or
soulcutter Jan 21, 2015
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
15 changes: 11 additions & 4 deletions packages/ember-metal/lib/computed_macros.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ registerComputed('lte', function(dependentKey, value) {
hamster.get('readyForCamp'); // false
hamster.set('hasBackpack', true);
hamster.get('readyForCamp'); // true
hamster.set('hasBackpack', 'Yes');
hamster.get('readyForCamp'); // 'Yes'
```

@method computed.and
Expand All @@ -408,12 +410,14 @@ registerComputed('lte', function(dependentKey, value) {
a logical `and` on the values of all the original values for properties.
*/
registerComputedWithProperties('and', function(properties) {
var value;
for (var key in properties) {
if (properties.hasOwnProperty(key) && !properties[key]) {
value = properties[key];
if (properties.hasOwnProperty(key) && !value) {
return false;
}
}
return true;
return value;
});

/**
Expand All @@ -430,8 +434,10 @@ registerComputedWithProperties('and', function(properties) {
var hamster = Hamster.create();

hamster.get('readyForRain'); // false
hamster.set('hasJacket', true);
hamster.set('hasUmbrella', true);
hamster.get('readyForRain'); // true
hamster.set('hasJacket', 'Yes');
hamster.get('readyForRain'); // 'Yes'
```

@method computed.or
Expand All @@ -443,7 +449,7 @@ registerComputedWithProperties('and', function(properties) {
registerComputedWithProperties('or', function(properties) {
for (var key in properties) {
if (properties.hasOwnProperty(key) && properties[key]) {
return true;
return properties[key];
}
}
return false;
Expand Down Expand Up @@ -472,6 +478,7 @@ registerComputedWithProperties('or', function(properties) {
@param {String} dependentKey*
@return {Ember.ComputedProperty} computed property which returns
the first truthy value of given list of properties.
@deprecated Use `Ember.computed.or` instead.
*/
registerComputedWithProperties('any', function(properties) {
for (var key in properties) {
Expand Down
11 changes: 10 additions & 1 deletion packages/ember-metal/tests/computed_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,11 @@ testBoth('computed.and', function(get, set) {
set(obj, 'one', false);

equal(get(obj, 'oneAndTwo'), false, 'one and not two');

set(obj, 'one', true);
set(obj, 'two', 2);

equal(get(obj, 'oneAndTwo'), 2, 'returns truthy value as in &&');
});

testBoth('computed.or', function(get, set) {
Expand All @@ -1101,9 +1106,13 @@ testBoth('computed.or', function(get, set) {

equal(get(obj, 'oneOrTwo'), false, 'nore one nore two');

set(obj, 'one', true);
set(obj, 'two', true);

equal(get(obj, 'oneOrTwo'), true, 'one or two');

set(obj, 'one', 1);

equal(get(obj, 'oneOrTwo'), 1, 'returns truthy value as in ||');
});

testBoth('computed.any', function(get, set) {
Expand Down