added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670

3 files changed, 8 insertions, 5 deletions

diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 3a1c1633..9db1c5b9 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -203,7 +203,8 @@ function handshake()
   //create the url
   var url = loc.protocol + "//" + loc.hostname + ":" + port + "/";
   //find out in which subfolder we are
-  var resource = loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "socket.io";
+  var resource = exports.baseURL + "socket.io";
+  
   //connect
   socket = pad.socket = io.connect(url, {
     resource: resource,
@@ -1029,7 +1030,7 @@ var settings = {
 };
 
 pad.settings = settings;
-
+exports.baseURL = '';
 exports.settings = settings;
 exports.createCookie = createCookie;
 exports.readCookie = readCookie;
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index a3a8a8df..1f66da41 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -24,6 +24,7 @@ exports.loaded = false;
 exports.plugins = {};
 exports.parts = [];
 exports.hooks = {};
+exports.baseURL = '';
 
 exports.ensure = function (cb) {
   if (!exports.loaded)
@@ -103,7 +104,7 @@ if (exports.isClient) {
     // which appears to fix the issue.
     var callback = function () {setTimeout(cb, 0);};
 
-    jQuery.getJSON('../pluginfw/plugin-definitions.json', function(data) {
+    jQuery.getJSON(exports.baseURL + 'pluginfw/plugin-definitions.json', function(data) {
       exports.plugins = data.plugins;
       exports.parts = data.parts;
       exports.hooks = exports.extractHooks(exports.parts, "client_hooks");
diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js
index 438b1695..6c91423b 100644
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@@ -60,8 +60,8 @@ function init() {
     //create the url
     var url = loc.protocol + "//" + loc.hostname + ":" + port + "/";
     //find out in which subfolder we are
-    var resource = loc.pathname.substr(1,loc.pathname.indexOf("/p/")) + "socket.io";
-
+    var resource = exports.baseURL + 'socket.io';
+    
     //build up the socket io connection
     socket = io.connect(url, {resource: resource});
 
@@ -153,4 +153,5 @@ function handleClientVars(message)
   }
 }
 
+exports.baseURL = '';
 exports.init = init;