From 8d35f24d35e7284397b70c6a9b05d5bea7417923 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 25 Jun 2012 08:15:35 +0000 Subject: [PATCH] changes related with new api in css-b64-images library --- lib/server/minify.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/server/minify.js b/lib/server/minify.js index 75462d8c..af8a1a29 100644 --- a/lib/server/minify.js +++ b/lib/server/minify.js @@ -96,7 +96,7 @@ exports.cssStyles=function cssStyles(pImgConvertToBase64_b){ try{ cleanCSS = require('clean-css'); }catch(error){ - console.log('can\'n load clean-css \n' + + console.log('can\'n load clean-css \n' + 'to use css-minification you need to install clean-css \n' + 'npm install clean-css\n' + 'https://github.com/GoalSmashers/clean-css'); @@ -131,9 +131,9 @@ exports.cssStyles=function cssStyles(pImgConvertToBase64_b){ * save all minimized css * to one file all.min.css */ - /* если включена конвертация картинок в base64 - * вызываем её - */ + /* если включена конвертация картинок в base64 + * вызываем её + */ if(lStyleCssDone && lResetCssDone) if(pImgConvertToBase64_b) base64_images(lAllStyle); @@ -235,12 +235,14 @@ function base64_images(pFileContent_s){ 'https://github.com/GoalSmashers/clean-css'); return false; } - - b64img('all.min.css', '.', function(err, css){ - //if(err) console.error('Error:', err); - //console.log('**'+css); + /* + b64img('all.min.css', '.', function(err, css){ + fs.writeFile('all.min.css', css, fileWrited('all.min.css')); + }, pFileContent_s); + */ + b64img.fromString(pFileContent_s, '.','', function(err, css){ fs.writeFile('all.min.css', css, fileWrited('all.min.css')); - }, pFileContent_s); + }); } /* Функция создаёт асинхроную версию