mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-15 03:26:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge f915285f15 into 5b89242c5b

Browse source
This commit is contained in:
John McLear 2013-02-25 02:14:00 -08:00
commit 17ace39f0a
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,8 +108,8 @@ function init() {
});
exports.socket = socket; // make the socket available
hooks.aCallAll("postTimesliderInit");
hooks.aCallAll("postTimesliderInit");
});
}

2
src/templates/timeslider.html
View file

@ -213,6 +213,8 @@
}
var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
plugins.baseURL = baseURL;
plugins.update(function () {