From 890ed1d546b9175120b22f4f4503016858811eaf Mon Sep 17 00:00:00 2001 From: coderaiser Date: Sun, 1 Jul 2012 06:56:38 -0400 Subject: [PATCH] css-saving-if-img-minification-selected-bug-resolved --- lib/server/minify.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/server/minify.js b/lib/server/minify.js index 87a39cde..88e75813 100644 --- a/lib/server/minify.js +++ b/lib/server/minify.js @@ -5,7 +5,11 @@ */ var fs = require('fs'); - + +/* CONSTANTS */ +/* dir contains css-files */ +var CSSDIR = 'css/'; + exports.jsScripts=function jsScripts(){ 'use strict'; @@ -104,7 +108,6 @@ exports.cssStyles=function cssStyles(pImgConvertToBase64_b){ } /* Константы */ - var CSSDIR = 'css/'; var STYLE_CSS = CSSDIR+'style.css'; var RESET_CSS = CSSDIR+'reset.css'; @@ -135,13 +138,11 @@ exports.cssStyles=function cssStyles(pImgConvertToBase64_b){ /* если включена конвертация картинок в base64 * вызываем её */ - if(lStyleCssDone && lResetCssDone) - if(pImgConvertToBase64_b) - base64_images(lAllStyle); - else - fs.writeFile(CSSDIR+'all.min.css', lAllStyle, fileWrited('all.min.css')); - - /* записываем сжатый css файл*/ + if(pImgConvertToBase64_b) + base64_images(lAllStyle); + else if(lStyleCssDone && lResetCssDone) + fs.writeFile(CSSDIR+'all.min.css', lAllStyle, fileWrited('all.min.css')); + /* записываем сжатый css файл*/ else fs.writeFile(minFileName, final_code, fileWrited(minFileName)); }; @@ -237,7 +238,7 @@ function base64_images(pFileContent_s){ return false; } b64img.fromString(pFileContent_s, '.','', function(err, css){ - fs.writeFile('all.min.css', css, fileWrited('all.min.css')); + fs.writeFile(CSSDIR+'all.min.css', css, fileWrited('all.min.css')); }); }