libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

Do not try to spawn a gzip process on windows

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-04 13:42:02 +01:00
parent 53242d4660
commit ce725ba6fc
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
node/utils/Minify.js
View file

@ -29,6 +29,7 @@ var path = require('path');
var Buffer = require('buffer').Buffer; var Buffer = require('buffer').Buffer;
var gzip = require('gzip'); var gzip = require('gzip');
var server = require('../server'); var server = require('../server');
var os = require('os');
var padJS = ["jquery.min.js", "pad_utils.js", "plugins.js", "undo-xpopup.js", "json2.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js", "jquery-ui.js", "chat.js"]; var padJS = ["jquery.min.js", "pad_utils.js", "plugins.js", "undo-xpopup.js", "json2.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js", "jquery-ui.js", "chat.js"];
@ -222,11 +223,20 @@ exports.minifyJS = function(req, res, jsFilename)
//write the results compressed in a file //write the results compressed in a file
function(callback) function(callback)
{ {
gzip(result, 9, function(err, compressedResult){ //spawn a gzip process if we're on a unix system
if(err) {callback(err); return} if(os.type().indexOf("Windows") == -1)
{
fs.writeFile("../var/minified_" + jsFilename + ".gz", compressedResult, callback); gzip(result, 9, function(err, compressedResult){
}); if(err) {callback(err); return}
fs.writeFile("../var/minified_" + jsFilename + ".gz", compressedResult, callback);
});
}
//skip this step on windows
else
{
callback();
}
} }
],callback); ],callback);
} }
@ -238,7 +248,7 @@ exports.minifyJS = function(req, res, jsFilename)
var gzipSupport = req.header('Accept-Encoding', '').indexOf('gzip') != -1; var gzipSupport = req.header('Accept-Encoding', '').indexOf('gzip') != -1;
var pathStr; var pathStr;
if(gzipSupport) if(gzipSupport && os.type().indexOf("Windows") == -1)
{ {
pathStr = path.normalize(__dirname + "/../../var/minified_" + jsFilename + ".gz"); pathStr = path.normalize(__dirname + "/../../var/minified_" + jsFilename + ".gz");
res.header('Content-Encoding', 'gzip'); res.header('Content-Encoding', 'gzip');