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

Minifying can be disabled for debugging now

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-07-14 20:11:03 +01:00
parent f871602754
commit 83829759e9
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
node/minify.js
View file

@ -231,9 +231,17 @@ exports.padJS = function(req, res)
//minifying is disabled, so load the files with jquery
else
{
res.write("function loadjsfile(filename){\n"+
"var fileref=document.createElement('script');\n"+
"fileref.setAttribute('type','text/javascript');\n"+
"var path = 'static/js/' + filename;\n"+
"fileref.setAttribute('src', path);\n" +
"document.getElementsByTagName('head')[0].appendChild(fileref);\n" +
"}\n");
for(var i in jsFiles)
{
res.write("$.getScript('/static/js/" + jsFiles[i]+ "');\n");
res.write("loadjsfile('"+ jsFiles[i] + "');\n");
}
res.end();

16
node/server.js
View file

@ -81,6 +81,20 @@ async.waterfall([
res.sendfile(filePath, { maxAge: exports.maxAge });
});
//if minified is disabled, we need to server the static files under /p/static too
//it looks like dynamic script loading works only for subfolders, thats the reason we're doing this
if(settings.minify == false)
{
//serve static files
app.get('/p/static/*', function(req, res)
{
res.header("Server", serverName);
var filePath = path.normalize(__dirname + "/.." + req.url.split("?")[0].replace("p/",""));
console.error(filePath);
res.sendfile(filePath, { maxAge: exports.maxAge });
});
}
//serve minified files
app.get('/minified/:id', function(req, res)
{
@ -149,7 +163,7 @@ async.waterfall([
//serve pad.html under /p
app.get('/p/:pad', function(req, res, next)
{
{
//ensure the padname is valid and the url doesn't end with a /
if(!isValidPadname(req.params.pad) || /\/$/.test(req.url))
{