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 'pr/1579' into toolbar-test

Browse source 
Conflicts:
	settings.json.template
	src/static/js/pad_editbar.js
This commit is contained in:
Marcel Klehr 2014-03-16 13:30:22 +01:00
commit a369347d86
6 changed files with 438 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/node/hooks/express/specialpages.js
View file

@ -1,5 +1,7 @@
var path = require('path');
var eejs = require('ep_etherpad-lite/node/eejs');
var toolbar = require("ep_etherpad-lite/node/utils/toolbar");
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
exports.expressCreateServer = function (hook_name, args, cb) {
// expose current stats
@ -30,8 +32,15 @@ exports.expressCreateServer = function (hook_name, args, cb) {
//serve pad.html under /p
args.app.get('/p/:pad', function(req, res, next)
{
res.send(eejs.require("ep_etherpad-lite/templates/pad.html", {req: req}));
{
hooks.callAll("padInitToolbar", {
toolbar: toolbar
});
res.send(eejs.require("ep_etherpad-lite/templates/pad.html", {
req: req,
toolbar: toolbar
}));
});
//serve timeslider.html under /p/$padname/timeslider