scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some promises not handling errors

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-11-03 20:42:10 +01:00
parent e57de564d9
commit 752af358df
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
public_html/js/Services/PostsAroundCalculator.js
View File

@ -27,7 +27,11 @@ App.Services.PostsAroundCalculator = function(_, promise, util, pager) {
getLinkToPostAround(postIds, position, query.page, 1))
.then(function(nextPostUrl, prevPostUrl) {
resolve(nextPostUrl, prevPostUrl);
}).fail(function() {
reject();
});
}).fail(function() {
reject();
});
});
}
@ -41,20 +45,23 @@ App.Services.PostsAroundCalculator = function(_, promise, util, pager) {
resolve(url);
} else if (page + direction >= 1) {
pager.setPage(page + direction);
promise.wait(pager.retrieveCached()).then(function(response) {
if (response.entities.length) {
var post = direction === - 1 ?
_.last(response.entities) :
_.first(response.entities);
promise.wait(pager.retrieveCached())
.then(function(response) {
if (response.entities.length) {
var post = direction === - 1 ?
_.last(response.entities) :
_.first(response.entities);
var url = util.appendComplexRouteParam(
'#/post/' + post.id,
_.extend({page: page + direction}, pager.getSearchParams()));
resolve(url);
} else {
resolve(null);
}
});
var url = util.appendComplexRouteParam(
'#/post/' + post.id,
_.extend({page: page + direction}, pager.getSearchParams()));
resolve(url);
} else {
resolve(null);
}
}).fail(function() {
reject();
});
} else {
resolve(null);
}