libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-08 11:12:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2328 from l-y-n-x/blocks-for-custom-script-and-styles

Browse source 
fixed socket.io path
This commit is contained in:
John McLear 2014-11-19 18:41:34 +00:00
commit acbcff07b6
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/static/js/admin/plugins.js
View file

@ -7,10 +7,10 @@ $(document).ready(function () {
pathComponents = location.pathname.split('/'), pathComponents = location.pathname.split('/'),
// Strip admin/plugins // Strip admin/plugins
baseURL = pathComponents.slice(0,pathComponents.length-2).join('/') + '/', baseURL = pathComponents.slice(0,pathComponents.length-2).join('/') + '/',
resource = baseURL.substring(1) + "socket.io"; path = baseURL + "socket.io";
//connect //connect
socket = io.connect(url, {resource : resource}).of("/pluginfw/installer"); socket = io.connect(url, {path : path}).of("/pluginfw/installer");
function search(searchTerm, limit) { function search(searchTerm, limit) {
if(search.searchTerm != searchTerm) { if(search.searchTerm != searchTerm) {

4
src/static/js/admin/settings.js
View file

@ -6,10 +6,10 @@ $(document).ready(function () {
pathComponents = location.pathname.split('/'), pathComponents = location.pathname.split('/'),
// Strip admin/plugins // Strip admin/plugins
baseURL = pathComponents.slice(0,pathComponents.length-2).join('/') + '/', baseURL = pathComponents.slice(0,pathComponents.length-2).join('/') + '/',
resource = baseURL.substring(1) + "socket.io"; path = baseURL + "socket.io";
//connect //connect
socket = io.connect(url, {resource : resource}).of("/settings"); socket = io.connect(url, {path : path}).of("/settings");
socket.on('settings', function (settings) { socket.on('settings', function (settings) {

4
src/static/js/pad.js
View file

@ -168,10 +168,10 @@ function handshake()
//create the url //create the url
var url = loc.protocol + "//" + loc.hostname + ":" + port + "/"; var url = loc.protocol + "//" + loc.hostname + ":" + port + "/";
//find out in which subfolder we are //find out in which subfolder we are
var resource = exports.baseURL.substring(1) + "socket.io"; var path = exports.baseURL + "socket.io";
//connect //connect
socket = pad.socket = io.connect(url, { socket = pad.socket = io.connect(url, {
resource: resource, path: path,
'max reconnection attempts': 3, 'max reconnection attempts': 3,
'sync disconnect on unload' : false 'sync disconnect on unload' : false
}); });

4
src/static/js/timeslider.js
View file

@ -59,10 +59,10 @@ function init() {
//create the url //create the url
var url = loc.protocol + "//" + loc.hostname + ":" + port + "/"; var url = loc.protocol + "//" + loc.hostname + ":" + port + "/";
//find out in which subfolder we are //find out in which subfolder we are
var resource = exports.baseURL.substring(1) + 'socket.io'; var path = exports.baseURL + 'socket.io';
//build up the socket io connection //build up the socket io connection
socket = io.connect(url, {resource: resource}); socket = io.connect(url, {path: path});
//send the ready message once we're connected //send the ready message once we're connected
socket.on('connect', function() socket.on('connect', function()