summaryrefslogtreecommitdiffstats
path: root/core/js/router.js
diff options
context:
space:
mode:
Diffstat (limited to 'core/js/router.js')
-rw-r--r--core/js/router.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/js/router.js b/core/js/router.js
index 44e7c30602e..e6ef54a1864 100644
--- a/core/js/router.js
+++ b/core/js/router.js
@@ -3,9 +3,12 @@ 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){
+ return;
+ }
this.routes_request.done(callback);
},
- routes_request: $.ajax(OC.router_base_url + '/core/routes.json', {
+ routes_request: !window.TESTING && $.ajax(OC.router_base_url + '/core/routes.json', {
dataType: 'json',
success: function(jsondata) {
if (jsondata.status === 'success') {
@@ -75,4 +78,4 @@ OC.Router = {
return OC.router_base_url + url;
}
-};
+}