minor changes

This commit is contained in:
coderaiser 2012-12-27 08:08:22 -05:00
parent f043fd27a5
commit 5ba73ac192
4 changed files with 11 additions and 7 deletions

View file

@ -99,7 +99,11 @@
lResetCSS = DIR + 'css/reset.css',
lIndex = DIR + 'html/index.html',
lMinify = Server.CloudServer.Minify;
lMinify = Server.CloudServer.Minify,
lCSSOptions = {
img : pAllowed.img,
merge : true
};
if (pAllowed.js) {
lOptimizeParams.push(LIBDIR + 'client.js');
@ -112,9 +116,9 @@
var lStyles = [];
lStyles[0] = {};
lStyles[0][lStyleCSS] = pAllowed.img;
lStyles[0][lStyleCSS] = lCSSOptions;
lStyles[1] = {};
lStyles[1][lResetCSS] = pAllowed.img;
lStyles[1][lResetCSS] = lCSSOptions;
lOptimizeParams.push(lStyles[0]);
lOptimizeParams.push(lStyles[1]);

View file

@ -6,7 +6,7 @@
"js" : true,
"css" : true,
"html" : true,
"img" : false
"img" : true
},
"github_key" : "891c251b925e4e967fa9",
"github_secret" : "afe9bed1e810c5dc44c4c2a953fc6efb1e5b0545",

View file

@ -334,14 +334,13 @@
(lCheck_f('css') && lMin_o.css) ||
(lCheck_f('html') && lMin_o.html);
if(lResult){
if(lResult)
lResult = CloudServer.Minify.optimize(lName, {
cache: true,
callback: function(pFileData){
lReadFileFunc_f(undefined, pFileData, false);
}
});
}
}
if(!lResult)

View file

@ -46,7 +46,8 @@
if(!pParams)
pParams = {};
pParams.force = this.force;
if(this.force)
pParams.force = this.force;
if(!this.MinFolder)
this.MinFolder = Minify.MinFolder;