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

Moved progress-related functions to promises

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-10-22 18:43:09 +02:00
parent 64743499b6
commit 8b217118af
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public_html/js/Promise.js
View File

@ -1,6 +1,6 @@
var App = App || {};
App.Promise = function(_, jQuery) {
App.Promise = function(_, jQuery, progress) {
var active = [];
var promiseId = 0;
@ -30,6 +30,7 @@ App.Promise = function(_, jQuery) {
}
function wait() {
progress.start();
var promises = arguments;
var deferred = jQuery.Deferred();
return jQuery.when.apply(jQuery, promises)
@ -37,6 +38,8 @@ App.Promise = function(_, jQuery) {
return deferred.resolve.apply(deferred, arguments);
}).fail(function() {
return deferred.reject.apply(deferred, arguments);
}).always(function() {
progress.done();
});
}
@ -57,4 +60,4 @@ App.Promise = function(_, jQuery) {
};
App.DI.registerSingleton('promise', ['_', 'jQuery'], App.Promise);
App.DI.registerSingleton('promise', ['_', 'jQuery', 'progress'], App.Promise);