public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles

pull/2368/head
John McLear 2014-12-21 23:43:21 +00:00
parent 3fe58068c0 ee3f3b8060
commit fdc930de3d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/node/utils/Minify.js
View File

@ -23,7 +23,7 @@ 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 CleanCSS = require('clean-css'); var cleanCSS = require('clean-css');
var jsp = require("uglify-js").parser; var jsp = require("uglify-js").parser;
var pro = require("uglify-js").uglify; var pro = require("uglify-js").uglify;
var path = require('path'); var path = require('path');
@ -411,8 +411,7 @@ function compressJS(values)
function compressCSS(values) function compressCSS(values)
{ {
var complete = values.join("\n"); var complete = values.join("\n");
var cleanCSS = new CleanCSS({}).minify(complete); return cleanCSS.process(complete);
return cleanCSS;
} }
exports.minify = minify; exports.minify = minify;

2
src/package.json
View File

@ -20,7 +20,7 @@
"express" : ">3.1.0 <3.9.0", "express" : ">3.1.0 <3.9.0",
"async" : ">=0.9.0", "async" : ">=0.9.0",
"connect" : "2.7.x", "connect" : "2.7.x",
"clean-css" : ">=2.0.0", "clean-css" : "0.3.2",
"uglify-js" : ">=2.4.15", "uglify-js" : ">=2.4.15",
"formidable" : ">=1.0.15", "formidable" : ">=1.0.15",
"log4js" : ">=0.6.21", "log4js" : ">=0.6.21",