mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-02-01 03:12:42 +01:00
worth testin this
This commit is contained in:
parent
fd20c5ef79
commit
a95d54207d
2 changed files with 27 additions and 5 deletions
|
@ -23,8 +23,7 @@
|
||||||
|
|
||||||
var log4js = require('log4js')
|
var log4js = require('log4js')
|
||||||
, async = require('async')
|
, async = require('async')
|
||||||
, stats = require('./stats')
|
, stats = require('./stats');
|
||||||
;
|
|
||||||
|
|
||||||
log4js.replaceConsole();
|
log4js.replaceConsole();
|
||||||
|
|
||||||
|
@ -81,6 +80,22 @@ async.waterfall([
|
||||||
function (callback)
|
function (callback)
|
||||||
{
|
{
|
||||||
hooks.callAll("createServer", {});
|
hooks.callAll("createServer", {});
|
||||||
|
|
||||||
|
// Create minified files
|
||||||
|
var minify = require('./utils/Minify');
|
||||||
|
|
||||||
|
minify.getFileCompressed("js/ace.js", "text/javascript", function(){
|
||||||
callback(null);
|
callback(null);
|
||||||
|
});
|
||||||
|
/*
|
||||||
|
minify.getFileCompressed("js/require-kernel.js", "text/javascript", function(){
|
||||||
|
callback(null);
|
||||||
|
});
|
||||||
|
*/
|
||||||
|
minify.getFileCompressed("css/pad.css", "text/css", function(){
|
||||||
|
callback(null);
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -35,7 +35,6 @@ var ROOT_DIR = path.normalize(__dirname + "/../../static/");
|
||||||
var TAR_PATH = path.join(__dirname, 'tar.json');
|
var TAR_PATH = path.join(__dirname, 'tar.json');
|
||||||
var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8'));
|
var tar = JSON.parse(fs.readFileSync(TAR_PATH, 'utf8'));
|
||||||
|
|
||||||
|
|
||||||
var LIBRARY_WHITELIST = [
|
var LIBRARY_WHITELIST = [
|
||||||
'async'
|
'async'
|
||||||
, 'security'
|
, 'security'
|
||||||
|
@ -225,6 +224,7 @@ function minify(req, res, next)
|
||||||
res.writeHead(200, {});
|
res.writeHead(200, {});
|
||||||
res.end();
|
res.end();
|
||||||
} else if (req.method == 'GET') {
|
} else if (req.method == 'GET') {
|
||||||
|
// console.warn("filename", filename, "cT", contentType);
|
||||||
getFileCompressed(filename, contentType, function (error, content) {
|
getFileCompressed(filename, contentType, function (error, content) {
|
||||||
if(ERR(error, function(){
|
if(ERR(error, function(){
|
||||||
res.writeHead(500, {});
|
res.writeHead(500, {});
|
||||||
|
@ -245,6 +245,8 @@ function minify(req, res, next)
|
||||||
|
|
||||||
// find all includes in ace.js and embed them.
|
// find all includes in ace.js and embed them.
|
||||||
function getAceFile(callback) {
|
function getAceFile(callback) {
|
||||||
|
console.warn("Minify happening, this sould only happen once...");
|
||||||
|
|
||||||
fs.readFile(ROOT_DIR + 'js/ace.js', "utf8", function(err, data) {
|
fs.readFile(ROOT_DIR + 'js/ace.js', "utf8", function(err, data) {
|
||||||
if(ERR(err, callback)) return;
|
if(ERR(err, callback)) return;
|
||||||
|
|
||||||
|
@ -263,7 +265,7 @@ function getAceFile(callback) {
|
||||||
// them into the file.
|
// them into the file.
|
||||||
async.forEach(founds, function (item, callback) {
|
async.forEach(founds, function (item, callback) {
|
||||||
var filename = item.match(/"([^"]*)"/)[1];
|
var filename = item.match(/"([^"]*)"/)[1];
|
||||||
|
console.debug("Read file", filename);
|
||||||
var baseURI = 'http://localhost:' + settings.port;
|
var baseURI = 'http://localhost:' + settings.port;
|
||||||
var resourceURI = baseURI + path.normalize(path.join('/static/', filename));
|
var resourceURI = baseURI + path.normalize(path.join('/static/', filename));
|
||||||
resourceURI = resourceURI.replace(/\\/g, '/'); // Windows (safe generally?)
|
resourceURI = resourceURI.replace(/\\/g, '/'); // Windows (safe generally?)
|
||||||
|
@ -312,8 +314,10 @@ function statFile(filename, callback, dirStatLimit) {
|
||||||
callback(error);
|
callback(error);
|
||||||
}
|
}
|
||||||
} else if (stats.isFile()) {
|
} else if (stats.isFile()) {
|
||||||
|
// console.warn("stats is file");
|
||||||
callback(null, stats.mtime.getTime(), true);
|
callback(null, stats.mtime.getTime(), true);
|
||||||
} else {
|
} else {
|
||||||
|
// console.warn("stats not file");
|
||||||
callback(null, stats.mtime.getTime(), false);
|
callback(null, stats.mtime.getTime(), false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -402,6 +406,7 @@ function getFile(filename, callback) {
|
||||||
|
|
||||||
function compressJS(values)
|
function compressJS(values)
|
||||||
{
|
{
|
||||||
|
console.debug("compressed JS");
|
||||||
var complete = values.join("\n");
|
var complete = values.join("\n");
|
||||||
var ast = jsp.parse(complete); // parse code and get the initial AST
|
var ast = jsp.parse(complete); // parse code and get the initial AST
|
||||||
ast = pro.ast_mangle(ast); // get a new AST with mangled names
|
ast = pro.ast_mangle(ast); // get a new AST with mangled names
|
||||||
|
@ -411,6 +416,7 @@ function compressJS(values)
|
||||||
|
|
||||||
function compressCSS(values)
|
function compressCSS(values)
|
||||||
{
|
{
|
||||||
|
console.debug("compressed CSS");
|
||||||
var complete = values.join("\n");
|
var complete = values.join("\n");
|
||||||
var minimized = new CleanCSS().minify(complete).styles;
|
var minimized = new CleanCSS().minify(complete).styles;
|
||||||
return minimized;
|
return minimized;
|
||||||
|
@ -420,3 +426,4 @@ exports.minify = minify;
|
||||||
|
|
||||||
exports.requestURI = requestURI;
|
exports.requestURI = requestURI;
|
||||||
exports.requestURIs = requestURIs;
|
exports.requestURIs = requestURIs;
|
||||||
|
exports.getFileCompressed = getFileCompressed;
|
||||||
|
|
Loading…
Reference in a new issue