summaryrefslogtreecommitdiff
path: root/src/static/js/pad.js
diff options
context:
space:
mode:
authorMatthias Bartelmeß <mba@fourplusone.de>2012-04-25 10:23:58 +0200
committerMatthias Bartelmeß <mba@fourplusone.de>2012-04-25 10:23:58 +0200
commit513deef76880e3b59ad9bcbaf9cdd7c5dfb036c9 (patch)
tree365660dd139879f66a10724034f17fb9cc96b97b /src/static/js/pad.js
parentd554420f573af28d91f036f56950fe031d330bb9 (diff)
downloadetherpad-lite-513deef76880e3b59ad9bcbaf9cdd7c5dfb036c9.zip
added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670
Diffstat (limited to 'src/static/js/pad.js')
-rw-r--r--src/static/js/pad.js5
1 files changed, 3 insertions, 2 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;