diff options
| author | John McLear <john@mclear.co.uk> | 2015-10-22 16:17:10 +0100 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2015-10-22 16:17:10 +0100 |
| commit | 0d769632df42c5f15d7125fd448059f004c68459 (patch) | |
| tree | 0f9f632f0562e76475bac3d76a3af1bf4faba5f8 /src | |
| parent | fa46f0b613c85c758d74e1cd8adb4760e33071b4 (diff) | |
| parent | 68e260783ca96c5984a98d32cbd2e6dc4205bd3b (diff) | |
| download | etherpad-lite-0d769632df42c5f15d7125fd448059f004c68459.zip | |
Merge pull request #2748 from CodeMichael/develop
allow /admin to run in a subdirectory
Diffstat (limited to 'src')
| -rw-r--r-- | src/static/js/admin/plugins.js | 2 | ||||
| -rw-r--r-- | src/static/js/admin/settings.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index d337da03..48d1ab70 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -11,7 +11,7 @@ $(document).ready(function () { //connect var room = url + "pluginfw/installer"; - socket = io.connect(room, {resource : resource}); + socket = io.connect(room, {path: baseURL + "socket.io", resource : resource}); function search(searchTerm, limit) { if(search.searchTerm != searchTerm) { diff --git a/src/static/js/admin/settings.js b/src/static/js/admin/settings.js index 8a4473d6..42b038d5 100644 --- a/src/static/js/admin/settings.js +++ b/src/static/js/admin/settings.js @@ -10,7 +10,7 @@ $(document).ready(function () { //connect var room = url + "settings"; - socket = io.connect(room, {resource : resource}); + socket = io.connect(room, {path: baseURL + "socket.io", resource : resource}); socket.on('settings', function (settings) { |