mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 06:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

new branch from master nice-pad-url

Browse source
This commit is contained in:
Wikinaut 2012-02-01 15:07:09 +01:00
parent dfa106df03
commit 1a87ffacea
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
node/server.js
View file

@ -257,22 +257,23 @@ async.waterfall([
}); });
}); });
//serve pad.html under /p //serve pad.html under / and /p for compatibility
app.get('/p/:pad', function(req, res, next) app.get( '(/p)?/:pad', function(req, res, next)
{ {
var filePath = path.normalize(__dirname + "/../static/pad.html"); var filePath = path.normalize(__dirname + "/../static/pad.html");
res.sendfile(filePath, { maxAge: exports.maxAge }); res.sendfile(filePath, { maxAge: exports.maxAge });
}); });
//serve timeslider.html under /p/$padname/timeslider //serve timeslider.html under /$padname/timeslider or /p/$padname/timeslider
app.get('/p/:pad/timeslider', function(req, res, next) app.get('(/p)?/:pad/timeslider', function(req, res, next)
{ {
var filePath = path.normalize(__dirname + "/../static/timeslider.html"); var filePath = path.normalize(__dirname + "/../static/timeslider.html");
res.sendfile(filePath, { maxAge: exports.maxAge }); res.sendfile(filePath, { maxAge: exports.maxAge });
}); });
//serve timeslider.html under /p/$padname/timeslider //handle export requests
app.get('/p/:pad/:rev?/export/:type', function(req, res, next) // app.get('(/p)?/:pad/:rev?/export/:type', function(req, res, next)
app.get('/:pad/:rev?/export/:type', function(req, res, next)
{ {
var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"]; var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"];
//send a 404 if we don't support this filetype //send a 404 if we don't support this filetype

6
static/js/pad_impexp.js
View file

@ -240,9 +240,9 @@ var padimpexp = (function()
{ {
pad = _pad; pad = _pad;
//get /p/padname //get /p/padname or /padname
var pad_root_path = new RegExp(/.*\/p\/[^\/]+/).exec(document.location.pathname) var pad_root_path = new RegExp(/.*\/[^\/]+/).exec(document.location.pathname)
//get http://example.com/p/padname //get http://example.com/p/padname or http://example.com/padname
var pad_root_url = document.location.href.replace(document.location.pathname, pad_root_path) var pad_root_url = document.location.href.replace(document.location.pathname, pad_root_path)
// build the export links // build the export links