From ece0c1ef24ca13bc6f49233fb312fc46184a9180 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 5 Jul 2012 06:41:35 -0400 Subject: [PATCH] nodester seeting up --- lib/server/minify.js | 18 ++++++------------ server.js | 2 +- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/server/minify.js b/lib/server/minify.js index fffd99da..b0df09b2 100644 --- a/lib/server/minify.js +++ b/lib/server/minify.js @@ -5,6 +5,7 @@ */ var fs = require('fs'); +var path=require('path'); /* CONSTANTS */ /* dir contains css-files */ @@ -33,11 +34,7 @@ exports.jsScripts=function jsScripts(){ return false; } /* Константы */ - - /* make direcotries with scripts accessible to write*/ - fs.chmodSync('/lib',777); - fs.chmodSync('/lib/client',777); - + var CLIENT_JS='client.js'; var CLOUDFUNC_JS='/lib/cloudfunc.js'; var CLIENT_KEYBINDING_JS='lib/client/keyBinding.js'; @@ -78,7 +75,7 @@ exports.jsScripts=function jsScripts(){ .replace('keyBinding.js','keyBinding.min.js')).length); /* записываем сжатый js-скрипт*/ - fs.writeFile(minFileName, final_code, fileWrited(minFileName)); + fs.writeFile(path.basename(minFileName), final_code, fileWrited(minFileName)); }; console.log('reading file ' + CLIENT_JS+'...'); fs.readFile(CLIENT_JS,fileReaded(CLIENT_JS,dataReaded_f)); @@ -121,9 +118,6 @@ exports.cssStyles=function cssStyles(pImgConvertToBase64_b){ var STYLE_CSS = CSSDIR+'style.css'; var RESET_CSS = CSSDIR+'reset.css'; - /* make direcotries with styles accessible to write*/ - fs.chmodSync(CSSDIR,777); - var lAllStyle=''; var lResetCssDone=false; var lStyleCssDone=false; @@ -155,10 +149,10 @@ exports.cssStyles=function cssStyles(pImgConvertToBase64_b){ if(pImgConvertToBase64_b) base64_images(lAllStyle); else - fs.writeFile(CSSDIR+'all.min.css', lAllStyle, fileWrited('all.min.css')); + fs.writeFile('all.min.css', lAllStyle, fileWrited('all.min.css')); } /* в другом случае - записываем сжатый css файл*/ - else fs.writeFile(minFileName, final_code, fileWrited(minFileName)); + else fs.writeFile(path.basename(minFileName), final_code, fileWrited(minFileName)); }; console.log('reading file ' + STYLE_CSS+'...'); @@ -254,7 +248,7 @@ function base64_images(pFileContent_s){ } b64img.fromString(pFileContent_s, '.','', function(err, css){ console.log('images converted to base64 and saved in css file'); - fs.writeFile(CSSDIR+'all.min.css', css, fileWrited('all.min.css')); + fs.writeFile('all.min.css', css, fileWrited('all.min.css')); }); } diff --git a/server.js b/server.js index 1c1a8b36..cb2afeea 100644 --- a/server.js +++ b/server.js @@ -547,7 +547,7 @@ CloudServer._readDir=function (pError, pFiles) lIndex = CloudServer.Minify.done.css? lIndex.replace('','') - .replace('style.css','all.min.css') + .replace('/css/style.css','all.min.css') :lIndex; lIndex = CloudServer.Minify.done.js?lIndex.replace('client.js','client.min.js'):lIndex;