diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-11-15 15:01:21 +0100 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-11-15 15:01:21 +0100 |
| commit | 25e4a071ef3f89a5573f1d67b0c3cb60ccf7c858 (patch) | |
| tree | b3dc94716d296a6a8c39c41c7a7fa6cc05794896 /core | |
| parent | e642d18e26f3a6448ac33b2f34341d9b3ee6baae (diff) | |
| download | nextcloud-server-25e4a071ef3f89a5573f1d67b0c3cb60ccf7c858.tar.gz nextcloud-server-25e4a071ef3f89a5573f1d67b0c3cb60ccf7c858.zip | |
fixed: this.routes_request is a deferred/promise
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/router.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/js/router.js b/core/js/router.js index 406f1912fed..77168e33025 100644 --- a/core/js/router.js +++ b/core/js/router.js @@ -4,11 +4,7 @@ OC.Router = { // register your ajax requests to load after the loading of the routes // has finished. otherwise you face problems with race conditions registerLoadedCallback: function(callback){ - if(this.routes_request.state() === 'resolved'){ - callback(); - } else { - this.loadedCallback = callback; - } + this.routes_request.done(callback); }, routes_request: $.ajax(OC.router_base_url + 'core/routes.json', { dataType: 'json', |