From d0561a4ce21a0b4048f1b220e53dac0f461c16fe Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 14 Jun 2012 08:45:09 +0000 Subject: [PATCH] minify return and all-styles-save bugs resolved --- minify.js | 12 +++++++----- server.js | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/minify.js b/minify.js index 84c5d910..97649b45 100644 --- a/minify.js +++ b/minify.js @@ -67,6 +67,8 @@ exports.jsScripts=function jsScripts(){ console.log('reading file ' + CLOUDFUNC_JS+'...'); fs.readFile(CLOUDFUNC_JS,fileReaded(CLOUDFUNC_JS,dataReaded_f)); + + return true; }; /* функция сжимает css-стили @@ -118,7 +120,7 @@ exports.cssStyles=function cssStyles(){ * save all minimized css * to one file all.min.css */ - (lStyleCssDone && lStyleCssDone)? + (lStyleCssDone && lResetCssDone)? fs.writeFile('all.min.css', lAllStyle, fileWrited('all.min.css')):''; /* записываем сжатый css файл*/ @@ -130,10 +132,8 @@ exports.cssStyles=function cssStyles(){ console.log('reading file ' + RESET_CSS+'...'); fs.readFile(RESET_CSS,fileReaded(RESET_CSS,dataReaded_f)); - /* - var source = "a{font-weight:bold;font-color:red}"; - var minimized = cleanCSS.process(source); - */ + + return true; }; /* функция сжимает css-стили @@ -201,6 +201,8 @@ exports.html=function(){ console.log('reading file ' + INDEX_HTML+'...'); fs.readFile(INDEX_HTML,fileReaded(INDEX_HTML,dataReaded_f)); + + return true; }; diff --git a/server.js b/server.js index 0c2b04f5..07f50bce 100644 --- a/server.js +++ b/server.js @@ -131,6 +131,7 @@ CloudServer.Minify={ this._allowed.js || this._allowed.html){ var lMinify = require('./minify'); + console.log(lMinify.jsScripts); this.done.js=this._allowed.js?lMinify.jsScripts():false; this.done.html=this._allowed.js?lMinify.html():false; this.done.css=this._allowed.js?lMinify.cssStyles():false;