From 5b4f1d146b42de65b3e297e486a851927191d745 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 27 Dec 2012 05:46:58 -0500
Subject: [PATCH] moving out doit from minify to cloudcmd

---
 cloudcmd.js          | 2 +-
 config.json          | 6 +++---
 lib/server.js        | 6 +++---
 lib/server/minify.js | 8 +++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cloudcmd.js b/cloudcmd.js
index 2a8f5021..7b606d51 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -99,7 +99,7 @@
             lResetCSS   = DIR + 'css/reset.css',
             lIndex      = DIR + 'html/index.html',
             
-            lMinify     = Server.Minify;
+            lMinify     = Server.CloudServer.Minify;
             
         if (pAllowed.js) {
             lOptimizeParams.push(LIBDIR + 'client.js');
diff --git a/config.json b/config.json
index aa2b1a72..88b0c179 100644
--- a/config.json
+++ b/config.json
@@ -3,9 +3,9 @@
     "appcache"              : false,
     "cache" : {"allowed" : false},
     "minification" : {
-        "js"    : false,
-        "css"   : false,
-        "html"  : false,
+        "js"    : true,
+        "css"   : true,
+        "html"  : true,
         "img"   : false
     },
     "github_key"            : "891c251b925e4e967fa9",
diff --git a/lib/server.js b/lib/server.js
index a11dc42f..a82e46b5 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -97,7 +97,7 @@
             lCache          = this.Cache,
             lAppCache       = this.AppCache,
             
-            lMinifyAllowed        = lConfig.minification;
+            lMinifyAllowed  = lConfig.minification;
         
         /* Переменная в которой храниться кэш*/
         lCache.setAllowed(lConfig.cache.allowed);
@@ -299,8 +299,8 @@
                     
                     lFromCache_o.cache = false;
                     
-                    lFileData = CloudServer.Minify.Cache[
-                        Path.basename(lName)];
+                    if(lMinify.Cache)
+                        lFileData = lMinify.Cache[Path.basename(lName)];
                 }
                 var lReadFileFunc_f = CloudServer.getReadFileFunc(lName),
                 /* если там что-то есть передаём данные в функцию readFile */
diff --git a/lib/server/minify.js b/lib/server/minify.js
index 9bca2be6..619255e8 100644
--- a/lib/server/minify.js
+++ b/lib/server/minify.js
@@ -39,15 +39,13 @@
                this._allowed = pAllowed;
            }
         }),
-            
-       
-        doit                    :(function(){
-        
-        }),
         
         optimize: function(pName, pParams){
             var lResult = true;
             
+            if(!pParams)
+                pParams = {};
+            
             pParams.force = this.force;
             
             if(!this.MinFolder)