From 68727b1c91f89f7b678b5169ad335184be88a7a8 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Fri, 15 Jun 2012 10:58:25 +0000
Subject: [PATCH] added minification of keyBinding.js

---
 client.js                                 | 14 ++++++--------
 keyBinding.js => lib/client/keyBinding.js |  0
 lib/cloudfunc.js                          |  3 +--
 lib/{ => server}/minify.js                | 15 ++++++++++++---
 server.js                                 |  5 +++--
 5 files changed, 22 insertions(+), 15 deletions(-)
 rename keyBinding.js => lib/client/keyBinding.js (100%)
 rename lib/{ => server}/minify.js (91%)

diff --git a/client.js b/client.js
index bd5ad275..6331b051 100644
--- a/client.js
+++ b/client.js
@@ -58,7 +58,9 @@ var CloudClient={
      _images                :{},     
      /* КОНСТАНТЫ*/
      /* название css-класа текущего файла*/
-     CURRENT_FILE           :'current-file'
+     CURRENT_FILE           :'current-file',
+     LIBDIR                 :'/lib',
+     LIBDIRCLIENT           :'/lib/client'
 };
 
 /* 
@@ -150,7 +152,7 @@ CloudClient.Cache.clear=(function(){
 /* функция обработки нажатий клавишь */
 CloudClient.keyBinding=(function(){
     /* loading keyBinding module and start it */
-    CloudClient.jsload('keyBinding.js',function(){
+    CloudClient.jsload(CloudClient.LIBDIRCLIENT+'/keyBinding.js',function(){
         CloudCommander.keyBinding();
     });
 });
@@ -245,11 +247,7 @@ CloudClient._setCurrent=(function(){
                     * на который нажали */
                     this.className=CloudClient.CURRENT_FILE;
                 }
-            }            
-                /*
-                    console.log('Error. Can\'t find current file.'+
-                    ' (CloudClient._setCurrent)');                                                 
-                */
+            }
              /* если мы попали сюда с энтера*/
              if(pFromEnter===true){
                 this.ondblclick(this);               
@@ -330,7 +328,7 @@ CloudClient.init=(function()
     });
     
         /* загружаем общие функции для клиента и сервера*/
-        CloudClient.jsload('lib/cloudfunc.js',function(){
+        CloudClient.jsload(CloudClient.LIBDIR+'/cloudfunc.js',function(){
         /* берём из обьекта window общий с сервером функционал */
         CloudFunc=window.CloudFunc;
             
diff --git a/keyBinding.js b/lib/client/keyBinding.js
similarity index 100%
rename from keyBinding.js
rename to lib/client/keyBinding.js
diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js
index e245bba2..a3bca483 100644
--- a/lib/cloudfunc.js
+++ b/lib/cloudfunc.js
@@ -30,9 +30,8 @@ var CloudFunc={
     REFRESHICON : 'refresh-icon',
     /* id панелей с файлами */
     LEFTPANEL   : 'left',
-    RIGHTPANEL  : 'right',
+    RIGHTPANEL  : 'right'
     /* name of direcotory with libs */
-    LIBDIR          :'./lib'
 };
 
 /*
diff --git a/lib/minify.js b/lib/server/minify.js
similarity index 91%
rename from lib/minify.js
rename to lib/server/minify.js
index 00a31b2d..7680747b 100644
--- a/lib/minify.js
+++ b/lib/server/minify.js
@@ -26,6 +26,7 @@ exports.jsScripts=function jsScripts(){
     /* Константы */
     var CLIENT_JS='client.js';
     var CLOUDFUNC_JS='lib/cloudfunc.js';
+    var CLIENT_KEYBINDING_JS='lib/client/keyBinding.js';
       
     var dataReaded_f=function(pFileName, pData){
             console.log('file ' + pFileName + ' readed');
@@ -47,6 +48,9 @@ exports.jsScripts=function jsScripts(){
             /* если мы сжимаем client.js -
              * меняем строку cloudfunc.js на
              * cloudfunc.min.js и выводим сообщение
+             *
+             * меняем строку keyBinding.js на
+             * keyBinding.min.js
              * если другой файл - ничего не деалем
              */
             if(pFileName===CLIENT_JS)
@@ -55,9 +59,10 @@ exports.jsScripts=function jsScripts(){
                     ' in '                  +
                     CLIENT_JS               +
                     ' changed. size:',
-                    (final_code=final_code.replace(CLOUDFUNC_JS,
-                        CLOUDFUNC_JS.replace('.js',
-                            '.min.js'))).length);
+                    (final_code=final_code
+                        .replace('cloudfunc.js','cloudfunc.min.js')
+                            .replace('keyBinding.js','keyBinding.min.js')));
+            
             /* записываем сжатый js-скрипт*/
             fs.writeFile(minFileName, final_code, fileWrited(minFileName));
         };
@@ -67,6 +72,10 @@ exports.jsScripts=function jsScripts(){
     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));
+    
+    
     return true;
 };
 
diff --git a/server.js b/server.js
index 662c2f75..59809cbc 100644
--- a/server.js
+++ b/server.js
@@ -45,7 +45,8 @@ var CloudServer={
     /* index.html */
     INDEX           :'index.html',
     /* name of direcotory with libs */
-    LIBDIR          :'./lib'
+    LIBDIR          :'./lib',
+    LIBDIRSERVER    :'./lib/server'
 };
 
 /* 
@@ -132,7 +133,7 @@ CloudServer.Minify={
         if(this._allowed.css ||
             this._allowed.js ||
             this._allowed.html){
-                var lMinify      = require(CloudServer.LIBDIR+'/minify');
+                var lMinify      = require(CloudServer.LIBDIRSERVER+'/minify');
 
                 this.done.js=this._allowed.js?lMinify.jsScripts():false;
                 this.done.html=this._allowed.html?lMinify.html():false;