From f74db92daefb8af0429d1e046d7c58df28345d5f Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 26 Jul 2012 08:56:04 -0400
Subject: [PATCH] refactored replacement of js file names

---
 lib/server/object.js | 60 ++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/lib/server/object.js b/lib/server/object.js
index 81c8bb35..433c6dba 100644
--- a/lib/server/object.js
+++ b/lib/server/object.js
@@ -104,7 +104,11 @@ exports.Minify={
                         'withou minify module\n'            +                        
                         'npm i minify');
                 }
-                /*
+              
+                var lOptimizeParams = [];
+                            
+                if (this._allowed.js) {
+                      /*
                  * temporary changed dir path,
                  * becouse directory lib is write
                  * protected by others by default
@@ -116,6 +120,13 @@ exports.Minify={
                 this.MinFolder = '/' + lMinify.MinFolder;
                 var lMinFolder=this.MinFolder;
                 
+                var getJSFiles_f = function(){
+                    return [this.LIBDIR     + 'cloudfunc.js',
+                            this.LIBDIRCLIENT   + 'keyBinding.js',
+                            this.LIBDIRCLIENT   + 'editor.js',
+                            this.LIBDIRCLIENT   + 'viewer.js'];
+                };
+                
                 /* post processing function for file
                  * client.js
                  */
@@ -129,30 +140,31 @@ exports.Minify={
                  * если другой файл - ничего не деалем
                  */             
                 var lPostProcessing_f = function(pFinalCode){
-                    console.log('file name of ' +
-                        'cloudfunc.js'          +
-                        ' in '                  +
-                        'client.js'             +
-                        ' changed. size:',
-                    (pFinalCode = pFinalCode
-                        .replace('editor.js','editor.min.js')
-                            .replace('viewer.js','viewer.min.js')
-                                .replace('cloudfunc.js','cloudfunc.min.js')                            
-                                    .replace('keyBinding.js','keyBinding.min.js')
-                                            .replace('/lib/client/', lMinFolder)
-                                                .replace('/lib/', lMinFolder)).length);
+                    console.log('file names in client.js changed:\n');
+                    
+                    var getMinName_f = function(pName){
+                        return pName.replace('.js','min.js');
+                    };
+                    
+                    var lJSFiles = getJSFiles_f();
+                    
+                    console.log(lJSFiles);
+                    for(var i=0; i < lJSFiles.length; i++){
+                        console.log(lJSFiles[i]+'\n');
+                        
+                        pFinalCode = pFinalCode.replace(lJSFiles[i],
+                            getMinName_f(lJSFiles[i]));
+                    }
+                    
+                    pFinalCode = pFinalCode
+                        .replace('/lib/client/', lMinFolder)
+                            .replace('/lib/', lMinFolder);
                     return pFinalCode;
-                };
-                
-                var lOptimizeParams = [];
-                            
-                if (this._allowed.js) {
-                    lOptimizeParams=[{
-                        'client.js': lPostProcessing_f},
-                        this.LIBDIR         + 'cloudfunc.js',
-                        this.LIBDIRCLIENT   + 'keyBinding.js',
-                        this.LIBDIRCLIENT   + 'editor.js',
-                        this.LIBDIRCLIENT   + 'viewer.js'];
+                };                                                                                                                                            
+                    
+                    lOptimizeParams = getJSFiles_f();
+                    lOptimizeParams[lOptimizeParams.length] = {
+                        'client.js': lPostProcessing_f};
                 }
                 
                 if (this._allowed.html)