Skip to content

Pass all values when resolving combined promise #3

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

Open
bm-i wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pass all values when resolving combined promise #3

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
9 changes: 7 additions & 2 deletions objc-promise/Promise.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,14 @@ + (Promise *)and:(NSArray *)promises
[promise when:^(id result) {
resolvedCount++;

// all promises have resolved, resolve our promise
// all promises have resolved,
// resolve our promise with all values
if (resolvedCount == count) {
[deferred resolve:result];
NSMutableArray *finalResult =
[NSMutableArray arrayWithCapacity:count];
for (Promise *promise in promises)
[finalResult addObject:promise.result];
[deferred resolve:finalResult];
}
} failed:^(NSError *error){
[deferred reject:error];
Expand Down