From 357347dd1fb674ee0358f5de9c186d3d8cb56980 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 31 Jan 2013 10:14:36 -0500
Subject: [PATCH] refactored

---
 cloudcmd.js             |  2 +-
 lib/server.js           |  4 ++--
 lib/server/ischanged.js | 28 +++++++++++-----------------
 lib/server/minify.js    | 12 +++++-------
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/cloudcmd.js b/cloudcmd.js
index 2f3bc023..cd21d61f 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -48,7 +48,7 @@
          * меняем в index.html обычные css на
          * минифицированый
          */
-        if(Minify._allowed.css){
+        if(Minify.allowed.css){
             var lPath = '/' + Minify.MinFolder.replace(DIR, '');
             lReplace_s = '<link rel=stylesheet href="/css/reset.css">';
             lData = Util.removeStr(lData, lReplace_s)
diff --git a/lib/server.js b/lib/server.js
index d044b07f..6db5ba54 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -262,7 +262,7 @@
                 AppCache.watch(lName);
             
             Util.log(Path.basename(lName));
-            var lMin    = Minify._allowed,
+            var lMin    = Minify.allowed,
                 lExt    = Util.getExtension(lName),
                 lResult =   lExt === '.js'      && lMin.js  ||
                             lExt === '.css'     && lMin.css ||
@@ -338,7 +338,7 @@
             
             var lMinName = Minify.getName(main.DIR + 'html/index.html');
             
-            CloudServer.INDEX = Minify._allowed.html ? lMinName : CloudServer.INDEX;
+            CloudServer.INDEX = Minify.allowed.html ? lMinName : CloudServer.INDEX;
             
             /*
              * сохраним указатель на response
diff --git a/lib/server/ischanged.js b/lib/server/ischanged.js
index 12966718..5e99306e 100644
--- a/lib/server/ischanged.js
+++ b/lib/server/ischanged.js
@@ -12,10 +12,9 @@
         CHANGESNAME     = DIR       + 'json/changes',
         CHANGES_JSON    = CHANGESNAME   + '.json',
         
-        Times           = main.require(CHANGESNAME) || [],
-        GTimesChanged;
+        Times           = main.require(CHANGESNAME) || [];
     
-    exports.isFileChanged = function(pFileName, pLastFile_b, pCallBack){
+    exports.isFileChanged = function(pFileName, pCallBack){
         var lReadedTime;
         
         var i, n = Times.length;
@@ -36,23 +35,18 @@
             if(!pError){
                 var lFileTime = pStat.mtime.getTime();
                   
-                if(lReadedTime !== lFileTime){
-                    Times[i]        = {
+                if(lReadedTime !== lFileTime)
+                    lTimeChanged = Times[i]        = {
                         name: pFileName,
                         time: lFileTime
                     };
-                    
-                    lTimeChanged    =
-                    GTimesChanged   = true;
-                }
-                
-                if(pLastFile_b && GTimesChanged)
-                    writeFile(CHANGES_JSON, Util.stringifyJSON(Times));
-            }
-            else{
-                Util.log(pError);
-                lTimeChanged = true;
             }
+            else
+                lTimeChanged = Util.log(pError);
+            
+            console.log(lTimeChanged);
+            if(lTimeChanged)
+                writeFile(CHANGES_JSON, Util.stringifyJSON(Times));
             
             Util.exec(pCallBack, lTimeChanged);
         });
@@ -68,7 +62,7 @@
             if(pError)
                 Util.log(pError);
             else
-                Util.log('minify: file ' + path.basename(pFileName) + ' writed...');
+                Util.log('file ' + path.basename(pFileName) + ' writed...');
         });
     }
 })();
\ No newline at end of file
diff --git a/lib/server/minify.js b/lib/server/minify.js
index 92f910b9..0a1301b3 100644
--- a/lib/server/minify.js
+++ b/lib/server/minify.js
@@ -29,7 +29,7 @@
         /* pathes to directories */
         INDEX           : HTMLDIR + 'index.html',
         /* приватный переключатель минимизации */
-        _allowed        : {
+        allowed        : {
             css     : true,
             js      : true,
             html    : true,
@@ -51,18 +51,16 @@
          */
         setAllowed              :(function(pAllowed){
            if(pAllowed){
-               this._allowed = pAllowed;
+               this.allowed = pAllowed;
            }
         }),
         
         optimize: function(pName, pParams){
             var lRet;
             if(Minify){
+                pParams.name    = Minify.getName(pName);
                 
-                if( !Util.isObject(pName) )
-                    pParams.name    = Minify.getName(pName);
-                
-                lRet = this._allowed.css || this._allowed.js || this._allowed.html;
+                lRet = this.allowed.css || this.allowed.js || this.allowed.html;
                 
                 if(!this.MinFolder)
                     this.MinFolder = Minify.MinFolder;
@@ -78,7 +76,7 @@
                     });
             }
             else{
-                this._allowed = {
+                this.allowed = {
                     js      : false,
                     css     : false,
                     html    : false