Compare commits
4 Commits
develop
...
blocks-for
Author | SHA1 | Date |
---|---|---|
John McLear | 3f27bdff0b | |
John McLear | acbcff07b6 | |
Quirin | da3b77fca6 | |
Quirin | 26ec4684b5 |
|
@ -7,11 +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
|
||||||
var room = url + "pluginfw/installer";
|
socket = io.connect(url, {path : path}).of("/pluginfw/installer");
|
||||||
socket = io.connect(room, {resource : resource});
|
|
||||||
|
|
||||||
function search(searchTerm, limit) {
|
function search(searchTerm, limit) {
|
||||||
if(search.searchTerm != searchTerm) {
|
if(search.searchTerm != searchTerm) {
|
||||||
|
|
|
@ -6,11 +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
|
||||||
var room = url + "settings";
|
socket = io.connect(url, {path : path}).of("/settings");
|
||||||
socket = io.connect(room, {resource : resource});
|
|
||||||
|
|
||||||
socket.on('settings', function (settings) {
|
socket.on('settings', function (settings) {
|
||||||
|
|
||||||
|
|
|
@ -167,10 +167,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
|
||||||
});
|
});
|
||||||
|
|
|
@ -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()
|
||||||
|
|
Loading…
Reference in New Issue