Skip to content

Update path.js #61

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
wshager wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update path.js #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8a6f67
Update path.js
wshager Mar 6, 2014
7a3a308
convert LazyArray to real array
wshager Mar 15, 2014
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
16 changes: 13 additions & 3 deletions path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,19 @@ exports.LinkResolving = function(model, getDataModel){
var rawResult = originalQuery.call(this, query, metadata);
if(model.links.some(function(link){ return link.resolution!==undefined; })){
return when(rawResult, function(rawResult){
var promises = rawResult.map(function(obj){
return resolve.call(self, obj, metadata);
});
// check for LazyArray
var promises;
if(rawResult instanceof LazyArray) {
promises = when(rawResult.toRealArray(), function(arr){
return arr.map(function(obj){
return resolve.call(self, obj, metadata);
});
});
} else {
promises = rawResult.map(function(obj){
return resolve.call(self, obj, metadata);
});
}
return when(all(promises), function(){ return rawResult; });
});
}
Expand Down