Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop

2012-04-29 19:11:34 +01:00 · 2012-04-29 19:11:34 +01:00 · e33b131696
parent 18b7340d87 122986798e
commit e33b131696
1 changed files with 1 additions and 1 deletions
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@ -60,7 +60,7 @@ function init() {
    //create the url
    var url = loc.protocol + "//" + loc.hostname + ":" + port + "/";
    //find out in which subfolder we are
-    var resource = exports.baseURL + 'socket.io';
+    var resource = exports.baseURL.substring(1) + 'socket.io';
    
    //build up the socket io connection
    socket = io.connect(url, {resource: resource});