From b7d3de4bf1ecea8b903b00f77da0a9bbc1f5efce Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 30 Jan 2013 09:56:40 -0500 Subject: [PATCH] minor changes --- ChangeLog | 2 ++ cloudcmd.js | 1 - lib/server/minify.js | 21 ++++++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index b38058cd..3331bfd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,8 @@ no storage modules setted up in modules.json. * From now any file minifying only if last modified time was changed. +* Removed ability to cache files in memory. + 2012.12.12, Version 0.1.8 diff --git a/cloudcmd.js b/cloudcmd.js index e204f201..694d87ce 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -23,7 +23,6 @@ * Win32 should be backslashes */ DIR = main.DIR; - console.log(main); readConfig(); Server.start(Config, { appcache : appCacheProcessing, diff --git a/lib/server/minify.js b/lib/server/minify.js index 2f117471..014c3b63 100644 --- a/lib/server/minify.js +++ b/lib/server/minify.js @@ -58,22 +58,25 @@ optimize: function(pName, pParams){ var lRet; if(Minify){ - if(!pParams) - pParams = {}; - if( !Util.isObject(pName) ){ - pParams.name = Minify.getName(pName); - pParams.calback = function(){ - main.sendFile(pParams); - }; - } + if( !Util.isObject(pName) ) + pParams.calback = function(pParams){ + var lRet = function(pData){ + if(pData){ + pParams.name = Minify.getName(pData.name); + main.sendFile(pParams); + } + }; + + return lRet; + }(pParams); lRet = this._allowed.css || this._allowed.js || this._allowed.html; if(!this.MinFolder) this.MinFolder = Minify.MinFolder; - if(pParams.force) + if(pParams && pParams.force) Minify.optimize(pName, pParams); else if(lRet) IsChanged.isFileChanged(pName, false, function(pChanged){