refactor(main) minify

This commit is contained in:
coderaiser 2014-07-14 09:44:38 -04:00
parent 89ed94a620
commit 0ced823b8b
2 changed files with 26 additions and 30 deletions

View file

@ -118,7 +118,7 @@
exports.ischanged = srvrequire('ischanged');
exports.files = srvrequire('files');
exports.minify = srvrequire('minify').Minify;
exports.minify = srvrequire('minify');
/* second initializing after all modules load, so global var is *
* totally filled of all information that should know all modules */

View file

@ -24,37 +24,33 @@
COULD_NOT_MINIFY = 'Could not minify without minify module\n' +
'npm i minify';
exports.Minify = {
/* pathes to directories */
INDEX : HTMLDIR + 'index.html',
/* pathes to directories */
exports.INDEX = HTMLDIR + 'index.html';
exports.optimize = function(name, params) {
var minifyName, isChanged, isExist,
exec = Util.exec;
optimize: function(name, params) {
var minifyName, isChanged, isExist,
exec = Util.exec;
if (!Minify) {
Util.log(COULD_NOT_MINIFY);
exec(params.callback);
} else {
minifyName = Minify.getName(name),
if (!Minify) {
Util.log(COULD_NOT_MINIFY);
exec(params.callback);
} else {
minifyName = Minify.getName(name),
isChanged = exec.with(IsChanged.isFileChanged, name),
isExist = function(callback) {
fs.exists(minifyName, callback);
};
exec.parallel([isChanged, isExist], function(error, changed, exists) {
if (changed || !exists)
Minify.optimize(name, params);
else
exec(params.callback, null, {
name: minifyName
});
});
}
},
getName : Minify ? Minify.getName : Util.retParam
isChanged = exec.with(IsChanged.isFileChanged, name),
isExist = function(callback) {
fs.exists(minifyName, callback);
};
exec.parallel([isChanged, isExist], function(error, changed, exists) {
if (changed || !exists)
Minify.optimize(name, params);
else
exec(params.callback, null, {
name: minifyName
});
});
}
};
exports.getName = Minify ? Minify.getName : Util.retParam;
})();