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 nprogress nesting

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-10-20 20:01:37 +02:00
parent 25080fd977
commit 88dfc0eb96
4 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public_html/js/Presenters/PagerPresenter.js
View File

@ -11,7 +11,7 @@ App.Presenters.PagerPresenter = function(
pager,
messagePresenter,
browsingSettings,
nprogress) {
progress) {
var $target;
var $pageList;
@ -85,11 +85,12 @@ App.Presenters.PagerPresenter = function(
function retrieve() {
messagePresenter.hideMessages($messages);
nprogress.start();
progress.start();
return promise.make(function(resolve, reject) {
promise.wait(pager.retrieve())
.then(function(response) {
progress.done();
updateCallback(response, forceClear || !endlessScroll);
forceClear = false;
if (!response.entities.length) {
@ -107,12 +108,11 @@ App.Presenters.PagerPresenter = function(
attachNextPageLoader();
}
refreshPageList();
nprogress.done();
resolve();
}).fail(function(response) {
progress.done();
clearContent();
hidePageList();
nprogress.done();
messagePresenter.showError($messages, response.json && response.json.error || response);
reject();
@ -223,4 +223,4 @@ App.Presenters.PagerPresenter = function(
};
App.DI.register('pagerPresenter', ['_', 'jQuery', 'util', 'promise', 'keyboard', 'router', 'pager', 'messagePresenter', 'browsingSettings', 'nprogress'], App.Presenters.PagerPresenter);
App.DI.register('pagerPresenter', ['_', 'jQuery', 'util', 'promise', 'keyboard', 'router', 'pager', 'messagePresenter', 'browsingSettings', 'progress'], App.Presenters.PagerPresenter);