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

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

Browse source
This commit is contained in:
John McLear 2014-12-21 23:43:21 +00:00
commit fdc930de3d
2 changed files with 3 additions and 4 deletions
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 async = require('async');
var fs = require('fs');
var CleanCSS = require('clean-css');
var cleanCSS = require('clean-css');
var jsp = require("uglify-js").parser;
var pro = require("uglify-js").uglify;
var path = require('path');
@ -411,8 +411,7 @@ function compressJS(values)
function compressCSS(values)
{
var complete = values.join("\n");
var cleanCSS = new CleanCSS({}).minify(complete);
return cleanCSS;
return cleanCSS.process(complete);
}
exports.minify = minify;