From 5d3fc1a7d77a6985e4f464a705012ead5e6dea23 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Fri, 9 Nov 2012 09:34:38 -0500
Subject: [PATCH] minor changes

---
 client.js            |  2 +-
 lib/client/socket.js |  2 +-
 lib/client/viewer.js | 60 ++++++++++++++++++++------------------------
 server.js            |  9 ++++---
 4 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/client.js b/client.js
index e8977a9f..d901202a 100644
--- a/client.js
+++ b/client.js
@@ -96,7 +96,7 @@ var loadModule                      = function(pParams){
     cloudcmd[lName] = function(pArg){
         Util.exec(lDoBefore);
         
-        DOM.jsload(cloudcmd.LIBDIRCLIENT + lPath, lFunc ||
+        return DOM.jsload(cloudcmd.LIBDIRCLIENT + lPath, lFunc ||
             function(){
                 cloudcmd[lName].Keys(pArg);
             });
diff --git a/lib/client/socket.js b/lib/client/socket.js
index 6634313d..168f97f5 100644
--- a/lib/client/socket.js
+++ b/lib/client/socket.js
@@ -65,7 +65,7 @@ var CloudCommander, DOM, Util, io;
                 lStderr;
             if(Messages.length){
                 /* show oll msg from buffer */
-                for(var i=0; i < Messages.length; i++){
+                for(var i = 0, n = Messages.length; i < n; i++){
                     lStdout = Messages[i].stdout;
                     lStderr = Messages[i].stderr;
                     
diff --git a/lib/client/viewer.js b/lib/client/viewer.js
index 1cf11556..2b54c23b 100644
--- a/lib/client/viewer.js
+++ b/lib/client/viewer.js
@@ -23,39 +23,35 @@ var CloudCommander, Util, DOM, CloudFunc, $;
     function set(){
         if(DOM.getByClass('fancybox').length)
             return;
-        try{
+        Util.tryCatchLog(function(){
             /* get current panel (left or right) */
-            var lPanel = DOM.getPanel();
-                
-            /* get all file links */
-            var lA = DOM.getByTag('a', lPanel);
+            var lPanel = DOM.getPanel(),
+                    
+                /* get all file links */
+                lA = DOM.getByTag('a', lPanel),
                         
-            var lDblClick_f = function(pA){
-                return function(){
-                    var lConfig  = FancyBox.getConfig();
-                    lConfig.href = pA.href;
-                    if(pA.rel)
-                        $.fancybox(lConfig);
-                    else
-                        FancyBox.loadData(pA, FancyBox.onDataLoaded);
-                };
+                lDblClick_f = function(pA){
+                    return function(){
+                        var lConfig  = FancyBox.getConfig();
+                        lConfig.href = pA.href;
+                        if(pA.rel)
+                            $.fancybox(lConfig);
+                        else
+                            FancyBox.loadData(pA, FancyBox.onDataLoaded);
+                    };
             };
             
             /* first two is not files nor folders*/
-            for (var i=2; i < lA.length; i++) {
+            for (var i = 2, n = lA.length; i < n; i++) {
                 var lName = lA[i].title || lA[i].textContent;
                 
-                lA[i].className    = 'fancybox';
-                if(CloudFunc.checkExtension(lName, ['png','jpg', 'gif','ico'])){                
-                    lA[i].rel          = 'gallery';
-                }
+                lA[i].className = 'fancybox';
+                if(CloudFunc.checkExtension(lName, ['png','jpg', 'gif','ico']))
+                    lA[i].rel   = 'gallery';
                 
                 lA[i].ondblclick = lDblClick_f(lA[i]);
             }
-                                    
-        }catch(pError){
-            console.log(pError);
-        }
+        });
     }
     
     
@@ -142,8 +138,6 @@ var CloudCommander, Util, DOM, CloudFunc, $;
      */
     FancyBox.loadData                   = function(pA, pSuccess_f){
         DOM.Images.showLoad();
-        
-        var lThis = this;                    
         var lLink = pA.href;
                         
         /* убираем адрес хоста */
@@ -154,12 +148,12 @@ var CloudCommander, Util, DOM, CloudFunc, $;
         
         DOM.ajax({
             url     : lLink,
-             error  : (function(jqXHR, textStatus, errorThrown){
-                 lThis.loading             = false; 
-                 return DOM.Images.showError(jqXHR, textStatus, errorThrown);
-             }),
-             
-             success:function(data, textStatus, jqXHR){                    
+            error  : Util.bind(function(jqXHR, textStatus, errorThrown){
+                this.loading             = false; 
+                return DOM.Images.showError(jqXHR, textStatus, errorThrown);
+            }, this),
+            
+            success:function(data, textStatus, jqXHR){                    
                if(typeof pSuccess_f === 'function')
                     pSuccess_f(data);
                                               
@@ -184,7 +178,7 @@ var CloudCommander, Util, DOM, CloudFunc, $;
     FancyBox.show                       = function(pCallBack){
         set();
                 
-        var lConfig = this.getConfig(),
+        var lConfig = FancyBox.getConfig(),
             lResult = Util.exec(pCallBack);
         if(!lResult){
             var lCurrentFile = DOM.getCurrentFile(),
@@ -194,7 +188,7 @@ var CloudCommander, Util, DOM, CloudFunc, $;
                 if(lA.rel)
                     $.fancybox.open({ href : lA.href },
                         lConfig);
-                else this.loadData(lA, this.onDataLoaded);
+                else FancyBox.loadData(lA, FancyBox.onDataLoaded);
             }
         }
         
diff --git a/server.js b/server.js
index 75803644..17095c61 100644
--- a/server.js
+++ b/server.js
@@ -172,7 +172,7 @@ CloudServer.start = function (pConfig, pIndexProcessing, pAppCachProcessing) {
     /* server mode or testing mode */
     if (lConfig.server) {
         var http = main.http,
-        lError = Util.tryCatchLog(function(){
+        lError = Util.tryCatchLog(Util.bind(function(){
             this.Server =  http.createServer(this._controller);
             this.Server.listen(this.Port, this.IP);
             
@@ -185,7 +185,7 @@ CloudServer.start = function (pConfig, pIndexProcessing, pAppCachProcessing) {
             
             console.log('Cloud Commander server running at http://' +
                 this.IP + ':' + this.Port);
-        });
+        }, this));
         if(lError)
             console.log('Cloud Commander server could not started');
     }else
@@ -444,8 +444,9 @@ CloudServer._controller = function(pReq, pRes)
         CloudServer.Statuses[DirPath]   = 200;
         
         /* saving query of current file */
-        CloudServer.Queries[DirPath]    = lQuery;
-        console.log(lQuery);
+        CloudServer.Queries[DirPath]    = lQuery;        
+        Util.log(lQuery);
+        
         console.log(DirPath);
         
         /* читаем основные данные о файле */