From 5ba73ac19254a92e33dcdf2e7b16e6cd87f10a39 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 27 Dec 2012 08:08:22 -0500
Subject: [PATCH] minor changes

---
 cloudcmd.js          | 10 +++++++---
 config.json          |  2 +-
 lib/server.js        |  3 +--
 lib/server/minify.js |  3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cloudcmd.js b/cloudcmd.js
index 20714e69..840cd07d 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -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]);
diff --git a/config.json b/config.json
index 88b0c179..270056fa 100644
--- a/config.json
+++ b/config.json
@@ -6,7 +6,7 @@
         "js"    : true,
         "css"   : true,
         "html"  : true,
-        "img"   : false
+        "img"   : true
     },
     "github_key"            : "891c251b925e4e967fa9",
     "github_secret"         : "afe9bed1e810c5dc44c4c2a953fc6efb1e5b0545",
diff --git a/lib/server.js b/lib/server.js
index a82e46b5..d59f6d91 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -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)
diff --git a/lib/server/minify.js b/lib/server/minify.js
index adfd7f29..ca34629e 100644
--- a/lib/server/minify.js
+++ b/lib/server/minify.js
@@ -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;