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 promises and its race conditions

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-10-02 00:30:25 +02:00
parent e1ae4eaa0d
commit 455ae2b881
18 changed files with 113 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public_html/js/Router.js
View File

@ -1,6 +1,6 @@
var App = App || {};
App.Router = function(pathJs, _, jQuery, util, appState, presenterManager) {
App.Router = function(pathJs, _, jQuery, promise, util, appState, presenterManager) {
var root = '#/';
var previousLocation = window.location.href;
@ -65,6 +65,9 @@ App.Router = function(pathJs, _, jQuery, util, appState, presenterManager) {
}
}
}
//abort every operation that can be executed
promise.abortAll();
previousLocation = window.location.href;
var finalParams = _.extend(
@ -87,4 +90,4 @@ App.Router = function(pathJs, _, jQuery, util, appState, presenterManager) {
};
App.DI.registerSingleton('router', ['pathJs', '_', 'jQuery', 'util', 'appState', 'presenterManager'], App.Router);
App.DI.registerSingleton('router', ['pathJs', '_', 'jQuery', 'promise', 'util', 'appState', 'presenterManager'], App.Router);