diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2012-11-15 15:15:07 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2012-11-15 15:15:07 -0800 |
| commit | d1c0f2a7393d82629bec961e056856846bd05465 (patch) | |
| tree | dbf63ec60658d792c3144033ace8caf4db99cbf1 /core | |
| parent | b99213f7a769ec61a64877203441adb276388fa5 (diff) | |
| parent | defdbe3c1036d4eb7b7793d2143a30bc9ce8d778 (diff) | |
| download | nextcloud-server-d1c0f2a7393d82629bec961e056856846bd05465.tar.gz nextcloud-server-d1c0f2a7393d82629bec961e056856846bd05465.zip | |
Merge pull request #454 from Raydiation/master
Routing fixes
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/router.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/js/router.js b/core/js/router.js index 8b66f5a05c5..3562785b342 100644 --- a/core/js/router.js +++ b/core/js/router.js @@ -1,9 +1,14 @@ OC.router_base_url = OC.webroot + '/index.php/', 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){ + this.routes_request.done(callback); + }, routes_request: $.ajax(OC.router_base_url + 'core/routes.json', { dataType: 'json', success: function(jsondata) { - if (jsondata.status == 'success') { + if (jsondata.status === 'success') { OC.Router.routes = jsondata.data; } } @@ -11,7 +16,7 @@ OC.Router = { generate:function(name, opt_params) { if (!('routes' in this)) { if(this.routes_request.state() != 'resolved') { - alert('wait');// wait + console.warn('To avoid race conditions, please register a callback');// wait } } if (!(name in this.routes)) { |