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

Fix minification of code

Browse source
This commit is contained in:
joassouza 2017-02-07 13:04:22 -02:00
parent d65ab4d80b
commit d1e6c8492d
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,9 +23,9 @@ var ERR = require("async-stacktrace");
var settings = require('./Settings'); var settings = require('./Settings');
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
var StringDecoder = require('string_decoder').StringDecoder;
var CleanCSS = require('clean-css'); var CleanCSS = require('clean-css');
var jsp = require("uglify-js").parser; var uglifyJS = require("uglify-js");
var pro = require("uglify-js").uglify;
var path = require('path'); var path = require('path');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var RequireKernel = require('etherpad-require-kernel'); var RequireKernel = require('etherpad-require-kernel');
@ -375,7 +375,9 @@ function getFileCompressed(filename, contentType, callback) {
callback(error, content); callback(error, content);
} else if (contentType == 'text/javascript') { } else if (contentType == 'text/javascript') {
try { try {
content = compressJS(content); var decoder = new StringDecoder('utf8');
var code = decoder.write(content); // convert from buffer to string
content = uglifyJS.minify(code, {fromString: true}).code;
} catch (error) { } catch (error) {
// silence // silence
} }
@ -398,14 +400,6 @@ function getFile(filename, callback) {
} }
} }
function compressJS(content)
{
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(filename, content, callback) function compressCSS(filename, content, callback)
{ {
try { try {