mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into timeslider-realtimeupdate+readonly-pads

Browse source 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
This commit is contained in:
Egil Moeller 2012-05-29 21:26:12 +02:00
commit 15a7d24450
32 changed files with 375 additions and 1962 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/static/js/timeslider.js
View file

@ -24,7 +24,6 @@
// assigns to the global `$` and augments it with plugins.
require('./jquery');
JSON = require('./json2');
require('./undo-xpopup');
var createCookie = require('./pad_utils').createCookie;
var readCookie = require('./pad_utils').readCookie;
@ -60,7 +59,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});