Compare commits

...

4 Commits

Author SHA1 Message Date
John McLear 3f27bdff0b use path instead of resource 2014-11-28 00:08:10 +00:00
John McLear acbcff07b6 Merge pull request #2328 from l-y-n-x/blocks-for-custom-script-and-styles
fixed socket.io path
2014-11-19 18:41:34 +00:00
Quirin da3b77fca6 fixed path to socket.io 2014-11-19 19:19:28 +01:00
Quirin 26ec4684b5 fixed socket.io path 2014-11-19 18:20:06 +01:00
4 changed files with 8 additions and 10 deletions

View File

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

View File

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

View File

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

View File

@ -59,10 +59,10 @@ function init() {
//create the url
var url = loc.protocol + "//" + loc.hostname + ":" + port + "/";
//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
socket = io.connect(url, {resource: resource});
socket = io.connect(url, {path: path});
//send the ready message once we're connected
socket.on('connect', function()