diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2013-03-01 23:11:03 +0100 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2013-03-01 23:11:03 +0100 |
commit | 5e7970f76158681876b51320d4f0e0b12ca01604 (patch) | |
tree | ae673236e344699d591bb9b4d512da2d58d44093 /core | |
parent | 301d065686b7cb4b49d7662e2edec9ed5fe4115b (diff) | |
parent | 31754a653b13fdf31273177f12c39e32cb8c4001 (diff) | |
download | nextcloud-server-5e7970f76158681876b51320d4f0e0b12ca01604.tar.gz nextcloud-server-5e7970f76158681876b51320d4f0e0b12ca01604.zip |
Merge master
Diffstat (limited to 'core')
-rw-r--r-- | core/js/router.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/router.js b/core/js/router.js index 3562785b342..b94721673a7 100644 --- a/core/js/router.js +++ b/core/js/router.js @@ -1,11 +1,11 @@ -OC.router_base_url = OC.webroot + '/index.php/', +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', { + routes_request: $.ajax(OC.router_base_url + '/core/routes.json', { dataType: 'json', success: function(jsondata) { if (jsondata.status === 'success') { |