fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2748 from CodeMichael/develop 

allow /admin to run in a subdirectory
This commit is contained in:
John McLear 2015-10-22 16:17:10 +01:00
parent fa46f0b613 68e260783c
commit 0d769632df
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/static/js/admin/plugins.js
View File

@ -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) {

2
src/static/js/admin/settings.js
View File

@ -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) {