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 progress behavior when navigating too fast

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-10-22 19:09:25 +02:00
parent 5455106577
commit 619a0c0cc4
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public_html/js/Promise.js
View File

@ -10,12 +10,23 @@ App.Promise = function(_, jQuery, progress) {
var promise = deferred.promise();
promise.promiseId = ++ promiseId;
progress.start();
callback(function() {
deferred.resolve.apply(deferred, arguments);
active = _.without(active, promise.promiseId);
try {
deferred.resolve.apply(deferred, arguments);
active = _.without(active, promise.promiseId);
progress.done();
} catch (e) {
progress.reset();
}
}, function() {
deferred.reject.apply(deferred, arguments);
active = _.without(active, promise.promiseId);
try {
deferred.reject.apply(deferred, arguments);
active = _.without(active, promise.promiseId);
progress.done();
} catch (e) {
progress.reset();
}
});
active.push(promise.promiseId);
@ -30,7 +41,6 @@ App.Promise = function(_, jQuery, progress) {
}
function wait() {
progress.start();
var promises = arguments;
var deferred = jQuery.Deferred();
return jQuery.when.apply(jQuery, promises)
@ -38,8 +48,6 @@ App.Promise = function(_, jQuery, progress) {
return deferred.resolve.apply(deferred, arguments);
}).fail(function() {
return deferred.reject.apply(deferred, arguments);
}).always(function() {
progress.done();
});
}