diff --git a/ChangeLog b/ChangeLog index 1e06ebe6..7d3641b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,8 @@ disabled in browsers. * Little bit changed styles. Fixed margins in responsive view. +* Fixed bug with minifying, if file do not minimized so allowed set to none. + 2012.08.24, Version 0.1.6 diff --git a/lib/server/object.js b/lib/server/object.js index d6e68195..da69a0c2 100644 --- a/lib/server/object.js +++ b/lib/server/object.js @@ -88,7 +88,7 @@ exports.Minify = { */ setAllowed :(function(pAllowed){ if(pAllowed){ - this._allowed=pAllowed; + this._allowed = pAllowed; } }), @@ -105,9 +105,12 @@ exports.Minify = { lMinify = require('minify'); }catch(pError){ this._allowed = {js:false,css:false,html:false}; - return console.log('You coud install minify ' + + + console.log('You coud install minify ' + 'for better download spead:\n' + 'npm i minify'); + + return this._allowed; } /* @@ -143,6 +146,8 @@ exports.Minify = { lMinify.optimize(lOptimizeParams); this.Cache = lMinify.Cache; + + return this._allowed; } }), diff --git a/server.js b/server.js index 6c153aa2..5b8cfba4 100644 --- a/server.js +++ b/server.js @@ -131,7 +131,7 @@ CloudServer.init = (function(){ */ this.Minify.setAllowed(CloudServer.Config.minification); /* Если нужно минимизируем скрипты */ - this.Minify.doit(); + this.Minify._allowed = this.Minify.doit(); var lAppCache = CloudServer.AppCache;