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

Merge pull request #3053 from danfuzz/fix-timeslider-lists

Browse source 
Fix timeslider lists / indents, but also make CSS `@import` work
This commit is contained in:
Stefan 2016-12-20 22:06:31 +01:00 • committed by GitHub
commit a1ec061017
5 changed files with 244 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/node/utils/Minify.js
View file

@ -1,7 +1,7 @@
/**
* This Module manages all /minified/* requests. It controls the
* minification && compression of Javascript and CSS.
*/
* This Module manages all /minified/* requests. It controls the
* minification && compression of Javascript and CSS.
*/
/*
* 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
@ -151,7 +151,7 @@ function minify(req, res, next)
} else {
res.writeHead(404, {});
res.end();
return;
return;
}
/* Handle static files for plugins/libraries:
@ -371,21 +371,19 @@ function requireDefinition() {
function getFileCompressed(filename, contentType, callback) {
getFile(filename, function (error, content) {
if (error || !content) {
if (error || !content || !settings.minify) {
callback(error, content);
} else {
if (settings.minify) {
if (contentType == 'text/javascript') {
try {
content = compressJS([content]);
} catch (error) {
// silence
}
} else if (contentType == 'text/css') {
content = compressCSS([content]);
}
} else if (contentType == 'text/javascript') {
try {
content = compressJS(content);
} catch (error) {
// silence
}
callback(null, content);
} else if (contentType == 'text/css') {
compressCSS(filename, content, callback);
} else {
callback(null, content);
}
});
}
@ -400,20 +398,30 @@ function getFile(filename, callback) {
}
}
function compressJS(values)
function compressJS(content)
{
var complete = values.join("\n");
var ast = jsp.parse(complete); // parse code and get the initial AST
var ast = jsp.parse(content); // parse code and get the initial AST
ast = pro.ast_mangle(ast); // get a new AST with mangled names
ast = pro.ast_squeeze(ast); // get an AST with compression optimizations
return pro.gen_code(ast); // compressed code here
}
function compressCSS(values)
function compressCSS(filename, content, callback)
{
var complete = values.join("\n");
var minimized = new CleanCSS().minify(complete).styles;
return minimized;
try {
var base = path.join(ROOT_DIR, path.dirname(filename));
new CleanCSS({relativeTo: base}).minify(content, function (errors, minified) {
if (errors) {
// On error, just yield the un-minified original.
callback(null, content);
} else {
callback(null, minified.styles);
}
});
} catch (error) {
// On error, just yield the un-minified original.
callback(null, content);
}
}
exports.minify = minify;