Skip to content

Make _.each break when false is returned #1545

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

Closed
melnikov-s wants to merge 1 commit into from
Closed

Make _.each break when false is returned #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions test/collections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@
answers = 0;
_.each(b, function(){ ++answers; });
equal(answers, 100, 'enumerates [0, length)');

var lastVal;
var c = [1,2,3,4,5];
_.each(c, function(num,i) {
lastVal = num;
if (i === 2) {
return false;
}
});

equal(lastVal, 3, 'breaks when false is returned');
});

test('map', function() {
Expand Down
11 changes: 4 additions & 7 deletions underscore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
// Save the previous value of the `_` variable.
var previousUnderscore = root._;

// Establish the object that gets returned to break out of a loop iteration.
var breaker = {};

// Save bytes in the minified (but not gzipped) version:
var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;

Expand Down Expand Up @@ -68,12 +65,12 @@
if (obj == null) return obj;
if (obj.length === +obj.length) {
for (var i = 0, length = obj.length; i < length; i++) {
if (iterator.call(context, obj[i], i, obj) === breaker) return;
if (iterator.call(context, obj[i], i, obj) === false) return;
}
} else {
var keys = _.keys(obj);
for (var i = 0, length = keys.length; i < length; i++) {
if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
if (iterator.call(context, obj[keys[i]], keys[i], obj) === false) return;
}
}
return obj;
Expand Down Expand Up @@ -165,7 +162,7 @@
var result = true;
if (obj == null) return result;
_.each(obj, function(value, index, list) {
if (!(result = result && predicate.call(context, value, index, list))) return breaker;
if (!(result = result && predicate.call(context, value, index, list))) return false;
});
return !!result;
};
Expand All @@ -177,7 +174,7 @@
var result = false;
if (obj == null) return result;
_.each(obj, function(value, index, list) {
if (result || (result = predicate.call(context, value, index, list))) return breaker;
if (result || (result = predicate.call(context, value, index, list))) return false;
});
return !!result;
};
Expand Down