From a1a304d3263fef4ffb89c68a660a2c6175aa598b Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 26 Nov 2013 16:30:54 +0000 Subject: [PATCH] feature(server) add checkExtension --- lib/server.js | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/server.js b/lib/server.js index 9c6806e0..aa295c3f 100644 --- a/lib/server.js +++ b/lib/server.js @@ -182,7 +182,7 @@ lName = Path.join(DIR, lName); lMin = lConfig.minify, - lCheck = Util.checkExtension(lName, ['.js', '.css', '.html']); + lCheck = checkExtension(lName); lResult = lMin && lCheck; Util.ifExec(!lResult, @@ -214,7 +214,7 @@ } function combine(params) { - var names, i, n, name, minName, stream, + var names, i, n, name, minName, stream, check, funcs = [], config = main.config, dir = DIR, @@ -262,11 +262,15 @@ else { for (i = 0; i < n; i++) { name = Path.join(DIR, names[i]); - minName = Minify.getName(name); + check = checkExtension(name); - if (name !== minName) { - names[i] = minName; - dir = ''; + if (check) { + minName = Minify.getName(name); + + if (name !== minName) { + names[i] = minName; + dir = ''; + } } funcs.push(minify(name)); @@ -278,6 +282,13 @@ return isCombine; } + function checkExtension(name) { + var ret; + + ret = Util.checkExtension(name, ['.js', '.css', '.html']); + + return ret;c + } exports.start = start;