From 6dde5720ffb0dff345070f40083c068f46147b3b Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Fri, 6 Jul 2012 07:18:54 -0400
Subject: [PATCH] take avay build in file name parameters in function jsScripts
 minify module to server.js

---
 lib/server/minify.js | 28 +++++++++++++++++-----------
 server.js            |  6 +++++-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lib/server/minify.js b/lib/server/minify.js
index 18b05dc3..73662f3f 100644
--- a/lib/server/minify.js
+++ b/lib/server/minify.js
@@ -48,7 +48,11 @@ var CSSDIR      = 'css/';
 
 exports.MinFolder = MinFolder;
 
-exports.jsScripts=function jsScripts(){
+/* function which minificate js-files
+ * @pJSFiles_a - varible, wich contain array
+ * of js file names
+ */
+exports.jsScripts=function jsScripts(pJSFiles_a){
     'use strict';    
     
     /* подключаем модуль uglify-js
@@ -67,8 +71,12 @@ exports.jsScripts=function jsScripts(){
     }
     /* Константы */        
     var CLIENT_JS='client.js';
-    var CLOUDFUNC_JS='lib/cloudfunc.js';
+    var CLOUDFUNC_JS='lib/cloudfunc.js';        
     var CLIENT_KEYBINDING_JS='lib/client/keyBinding.js';
+    
+    pJSFiles_a=['client.js',
+        'lib/cloudfunc.js',
+        'lib/client/keyBinding.js'];
       
     var dataReaded_f=function(pFileName, pData){
             console.log('file ' + pFileName + ' readed');
@@ -87,6 +95,7 @@ exports.jsScripts=function jsScripts(){
             var final_code=uglify_js(pData);
             
             var minFileName=pFileName.replace('.js','.min.js');
+            
             /* если мы сжимаем client.js -
              * меняем строку cloudfunc.js на
              * cloudfunc.min.js и выводим сообщение
@@ -125,16 +134,13 @@ exports.jsScripts=function jsScripts(){
             /* записываем сжатый js-скрипт*/
             fs.writeFile(minFileName, final_code, fileWrited(minFileName));
         };
-     console.log('reading file ' + CLIENT_JS+'...');
-    fs.readFile(CLIENT_JS,fileReaded(CLIENT_JS,dataReaded_f));
-    
-    console.log('reading file ' + CLOUDFUNC_JS+'...');
-    fs.readFile(CLOUDFUNC_JS,fileReaded(CLOUDFUNC_JS,dataReaded_f));    
-    
-    console.log('reading file ' + CLIENT_KEYBINDING_JS+'...');
-    fs.readFile(CLIENT_KEYBINDING_JS, fileReaded(CLIENT_KEYBINDING_JS,dataReaded_f));
-    
     
+    /* moving thru all elements of js files array */
+    for(var i=0;pJSFiles_a[i];i++){
+        console.log('reading file ' + pJSFiles_a[i]+'...');
+        fs.readFile(pJSFiles_a[i],fileReaded(pJSFiles_a[i],dataReaded_f));
+    }
+        
     return true;
 };
 
diff --git a/server.js b/server.js
index 50f46c4b..0e676b66 100644
--- a/server.js
+++ b/server.js
@@ -141,7 +141,11 @@ CloudServer.Minify={
             this._allowed.html){
                 var lMinify      = require(CloudServer.LIBDIRSERVER+'/minify');
 
-                this.done.js=this._allowed.js?lMinify.jsScripts():false;
+                this.done.js=this._allowed.js?lMinify.jsScripts(['client.js',
+                                                                'lib/cloudfunc.js',
+                                                                'lib/client/keyBinding.js'])                                                                
+                                                                :false;
+                                                                
                 this.done.html=this._allowed.html?lMinify.html():false;
                 this.done.css=this._allowed.css?lMinify.cssStyles(this._allowed.img):false;