diff options
| -rw-r--r-- | core/js/router.js | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/core/js/router.js b/core/js/router.js index 02c8d11e695..8b66f5a05c5 100644 --- a/core/js/router.js +++ b/core/js/router.js @@ -1,30 +1,17 @@ OC.router_base_url = OC.webroot + '/index.php/', OC.Router = { - loadedCallback: null, - // 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; - } - }, 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; - if(OC.Router.loadedCallback !== null){ - OC.Router.loadedCallback(); - } } } }), generate:function(name, opt_params) { if (!('routes' in this)) { if(this.routes_request.state() != 'resolved') { - alert('To avoid race conditions, please register a callback');// wait + alert('wait');// wait } } if (!(name in this.routes)) { |