diff --git a/cloudcmd.js b/cloudcmd.js index 22d521d9..d622e044 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -289,9 +289,8 @@ }); }, function(callback) { Minify.optimize(PATH_INDEX, { - callback : callback, returnName : true - }); + }, callback); }); } diff --git a/lib/server.js b/lib/server.js index fc960a22..eea9552a 100644 --- a/lib/server.js +++ b/lib/server.js @@ -214,16 +214,13 @@ }); }, function(callback) { Minify.optimize(name, { - callback : callback, returnName : true - }); + }, callback); }); } function minify(name, callback) { - Minify.optimize(name, { - callback : callback - }); + Minify.optimize(name, callback); } function beforeJoin(names, callback) { diff --git a/lib/server/minify.js b/lib/server/minify.js index d40bc918..ff958a96 100644 --- a/lib/server/minify.js +++ b/lib/server/minify.js @@ -26,13 +26,18 @@ /* pathes to directories */ exports.INDEX = HTMLDIR + 'index.html'; - exports.optimize = function(name, params) { + exports.optimize = function(name, params, callback) { var minifyName, isChanged, isExist, exec = Util.exec; + Util.checkArgs(arguments, ['name', 'callback']); + + if (!callback) + callback = params; + if (!Minify) { Util.log(COULD_NOT_MINIFY); - exec(params.callback); + callback(); } else { minifyName = Minify.getName(name), @@ -41,9 +46,9 @@ exec.parallel([isChanged, isExist], function(error, changed, exists) { if (changed || !exists) - Minify.optimize(name, params); + Minify.optimize(name, params, callback); else - exec(params.callback, null, { + callback(null, { name: minifyName }); }); diff --git a/package.json b/package.json index 90c526a0..29e093f1 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "express": "~4.6.1", "http-auth": "2.1.x", "marked": "~0.3.2", - "minify": "~0.6.x", + "minify": "~0.7.x", "mkdirp": "~0.5.0", "morgan": "~1.1.x", "rimraf": "~2.2.6",