Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-19 01:17:18 +00:00
Code Issues Projects Releases Wiki Activity

moving index.min.html to min folder

Browse source
This commit is contained in:
coderaiser 2012-07-05 10:37:59 -04:00
parent 7a5ddb1b52
commit 79e6382cac
2 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/server/minify.js
View file

@ -18,10 +18,7 @@ var MinFolder='./min/';
var folderExist = function(pError){
if(!pError)
console.log('folder exist: ' + MinFolder);
else MinFolder='';
/* saving MinFolder name to outer varible */
exports.MinFolder=MinFolder;
else MinFolder='';
};
/*
@ -32,7 +29,7 @@ var folderExist = function(pError){
var makeFolder = function(pError){
if(!pError)
console.log('folder created: min');
else fs.stat(MinFolder,folderExist);
else fs.stat(MinFolder,folderExist);
};
/* Trying to create folder min
@ -46,6 +43,9 @@ fs.mkdir(MinFolder,511,makeFolder);
/* dir contains css-files */
var CSSDIR = 'css/';
exports.MinFolder = MinFolder;
exports.jsScripts=function jsScripts(){
'use strict';
@ -111,11 +111,17 @@ exports.jsScripts=function jsScripts(){
(final_code=final_code
.replace('cloudfunc.js','cloudfunc.min.js')
.replace('keyBinding.js','keyBinding.min.js')
.replace('/lib',MinFolder)
.replace('/lib/client',MinFolder)).length);
.replace('/lib', MinFolder)
.replace('/lib/client', MinFolder)).length);
/* minimized file will be in min file
* if it's possible if not -
* in root
*/
minFileName = MinFolder+path.basename(minFileName)
/* записываем сжатый js-скрипт*/
fs.writeFile(MinFolder+path.basename(minFileName), final_code, fileWrited(minFileName));
fs.writeFile(minFileName, final_code, fileWrited(minFileName));
};
console.log('reading file ' + CLIENT_JS+'...');
fs.readFile(CLIENT_JS,fileReaded(CLIENT_JS,dataReaded_f));
@ -189,10 +195,13 @@ exports.cssStyles=function cssStyles(pImgConvertToBase64_b){
if(pImgConvertToBase64_b)
base64_images(lAllStyle);
else
fs.writeFile(MinFolder + 'all.min.css', lAllStyle, fileWrited('all.min.css'));
fs.writeFile(MinFolder + 'all.min.css', lAllStyle, fileWrited(MinFolder + 'all.min.css'));
}
/* в другом случае - записываем сжатый css файл*/
else fs.writeFile(MinFolder + path.basename(minFileName), final_code, fileWrited(minFileName));
else{
minFileName = MinFolder + path.basename(minFileName);
fs.writeFile(minFileName, final_code, fileWrited(minFileName));
}
};
console.log('reading file ' + STYLE_CSS+'...');
@ -290,7 +299,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(MinFolder + 'all.min.css', css, fileWrited('all.min.css'));
fs.writeFile(MinFolder + 'all.min.css', css, fileWrited(MinFolder + 'all.min.css'));
});
}

14
server.js
View file

@ -144,8 +144,8 @@ CloudServer.Minify={
this.done.js=this._allowed.js?lMinify.jsScripts():false;
this.done.html=this._allowed.html?lMinify.html():false;
this.done.css=this._allowed.css?lMinify.cssStyles(this._allowed.img):false;
this.MinFolder=lMinify.MinFolder;
this.MinFolder=lMinify.MinFolder;
}
}),
/* свойство показывающее случилась ли ошибка*/
@ -437,12 +437,13 @@ CloudServer._controller=function(pReq, pRes)
* загружаем сжатый html-файл в дальнейшем
*/
CloudServer.INDEX=(CloudServer.Minify.done.html?
CloudServer.Minify.FolderName+'index.min.html'
CloudServer.Minify.MinFolder+'index.min.html'
:CloudServer.INDEX);
/*
* сохраним указатель на response
*/
CloudServer.Responses[CloudServer.INDEX]=pRes;
if(lStat.isDirectory())
Fs.readdir(LeftDir,CloudServer._readDir);
/* отдаём файл */
@ -555,10 +556,13 @@ CloudServer._readDir=function (pError, pFiles)
lIndex = CloudServer.Minify.done.css?
lIndex.replace('<link rel=stylesheet href="/css/reset.css">','')
.replace('/css/style.css','all.min.css')
.replace('/css/style.css',CloudServer.Minify.MinFolder + 'all.min.css')
:lIndex;
lIndex = CloudServer.Minify.done.js?lIndex.replace('client.js','client.min.js'):lIndex;
lIndex = CloudServer.Minify.done.js?lIndex.replace('client.js',
CloudServer.Minify.MinFolder +
'client.min.js')
:lIndex;
lIndex=lIndex.toString().replace('<div id=fm class=no-js>','<div id=fm class=no-js>'+lList);
/* меняем title */