From 26ec4684b5834be00402f0360db1f10febdfd10a Mon Sep 17 00:00:00 2001
From: Quirin <quirinh@gmail.com>
Date: Wed, 19 Nov 2014 18:18:07 +0100
Subject: [PATCH 1/2] fixed socket.io path

---
 src/static/js/pad.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index e1c199989..26b581fc4 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -168,10 +168,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
   });

From da3b77fca62e6aebb30462bdde3d84e15dfee8f1 Mon Sep 17 00:00:00 2001
From: Quirin <quirinh@gmail.com>
Date: Wed, 19 Nov 2014 19:18:32 +0100
Subject: [PATCH 2/2] fixed path to socket.io

---
 src/static/js/admin/plugins.js  | 4 ++--
 src/static/js/admin/settings.js | 4 ++--
 src/static/js/timeslider.js     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index e6c7a1224..fc7673efa 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -7,10 +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
-  socket = io.connect(url, {resource : resource}).of("/pluginfw/installer");
+  socket = io.connect(url, {path : path}).of("/pluginfw/installer");
 
   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 fb3f2e973..bc04babb2 100644
--- a/src/static/js/admin/settings.js
+++ b/src/static/js/admin/settings.js
@@ -6,10 +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
-  socket = io.connect(url, {resource : resource}).of("/settings");
+  socket = io.connect(url, {path : path}).of("/settings");
 
   socket.on('settings', function (settings) {
 
diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js
index b3c10b8a3..40610737c 100644
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@@ -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()