allow favicon.ico as pad name

pull/1124/head
Wikinaut 2012-11-04 13:02:55 +01:00
parent c92b5283fd
commit a575de7884
1 changed files with 13 additions and 12 deletions

View File

@ -24,7 +24,19 @@ exports.expressCreateServer = function (hook_name, args, cb) {
}); });
}); });
//serve favicon.ico from all path levels //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}));
});
//serve timeslider.html under /p/$padname/timeslider
args.app.get('/p/:pad/timeslider', function(req, res, next)
{
res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html", {req: req}));
});
//serve favicon.ico from all path levels except as a pad name
args.app.get( /\/favicon.ico$/, function(req, res) args.app.get( /\/favicon.ico$/, function(req, res)
{ {
var filePath = path.normalize(__dirname + "/../../../static/custom/favicon.ico"); var filePath = path.normalize(__dirname + "/../../../static/custom/favicon.ico");
@ -39,16 +51,5 @@ 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}));
});
//serve timeslider.html under /p/$padname/timeslider
args.app.get('/p/:pad/timeslider', function(req, res, next)
{
res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html", {req: req}));
});
} }