mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 16:05:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Drop support for file inlining in Minify.

Browse source
This commit is contained in:
Chad Weider 2012-02-29 13:09:47 -08:00
parent b977e1acd6
commit 5118dcc687
1 changed files with 2 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

88
node/utils/Minify.js
View file

@ -126,52 +126,9 @@ exports.minify = function(req, res, next)
}); });
} }
// find all includes in ace.js and embed them.
function getAceFile(callback) {
fs.readFile(ROOT_DIR + 'js/ace.js', "utf8", function(err, data) {
if(ERR(err, callback)) return;
// Find all includes in ace.js and embed them
var founds = data.match(/\$\$INCLUDE_[a-zA-Z_]+\("[^"]*"\)/gi);
if (!settings.minify) {
founds = [];
}
data += ';\n';
data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n';
// Request the contents of the included file on the server-side and write
// them into the file.
async.forEach(founds, function (item, callback) {
var filename = item.match(/"([^"]*)"/)[1];
var request = require('request');
var baseURI = 'http://localhost:' + settings.port
request(baseURI + path.normalize(path.join('/static/', filename)), function (error, response, body) {
if (!error && response.statusCode == 200) {
data += 'Ace2Editor.EMBEDED[' + JSON.stringify(filename) + '] = '
+ JSON.stringify(body || '') + ';\n';
} else {
// Silence?
}
callback();
});
}, function(error) {
callback(error, data);
});
});
}
// Check for the existance of the file and get the last modification date. // Check for the existance of the file and get the last modification date.
function statFile(filename, callback) { function statFile(filename, callback) {
if (filename == 'js/ace.js') { if (filename == 'js/require-kernel.js') {
// Sometimes static assets are inlined into this file, so we have to stat
// everything.
lastModifiedDateOfEverything(function (error, date) {
callback(error, date, !error);
});
} else if (filename == 'js/require-kernel.js') {
callback(null, requireLastModified(), true); callback(null, requireLastModified(), true);
} else { } else {
fs.stat(ROOT_DIR + filename, function (error, stats) { fs.stat(ROOT_DIR + filename, function (error, stats) {
@ -198,45 +155,6 @@ function statFile(filename, callback) {
}); });
} }
} }
function lastModifiedDateOfEverything(callback) {
var folders2check = [ROOT_DIR + 'js/', ROOT_DIR + 'css/'];
var latestModification = 0;
//go trough this two folders
async.forEach(folders2check, function(path, callback)
{
//read the files in the folder
fs.readdir(path, function(err, files)
{
if(ERR(err, callback)) return;
//we wanna check the directory itself for changes too
files.push(".");
//go trough all files in this folder
async.forEach(files, function(filename, callback)
{
//get the stat data of this file
fs.stat(path + "/" + filename, function(err, stats)
{
if(ERR(err, callback)) return;
//get the modification time
var modificationTime = stats.mtime.getTime();
//compare the modification time to the highest found
if(modificationTime > latestModification)
{
latestModification = modificationTime;
}
callback();
});
}, callback);
});
}, function () {
callback(null, latestModification);
});
}
// This should be provided by the module, but until then, just use startup // This should be provided by the module, but until then, just use startup
// time. // time.
@ -270,9 +188,7 @@ function getFileCompressed(filename, contentType, callback) {
} }
function getFile(filename, callback) { function getFile(filename, callback) {
if (filename == 'js/ace.js') { if (filename == 'js/require-kernel.js') {
getAceFile(callback);
} else if (filename == 'js/require-kernel.js') {
callback(undefined, requireDefinition()); callback(undefined, requireDefinition());
} else { } else {
fs.readFile(ROOT_DIR + filename, callback); fs.readFile(ROOT_DIR + filename, callback);