From 4d41d47104bcbad65b70febebb842b5bc2e8f6a1 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Mon, 6 Oct 2014 08:55:55 -0400
Subject: [PATCH] feature(client) createFileTable: add getCurrentFileByName

---
 lib/client.js     | 33 +++++++--------------------------
 lib/client/dom.js |  4 ++--
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/lib/client.js b/lib/client.js
index 0f54a1cb..d4efe24f 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -379,16 +379,12 @@ var Util, DOM, CloudFunc, join;
          * @param callback
          */
         function createFileTable(json, panelParam, history, callback) {
-            var files,
-                panel           = panelParam || DOM.getPanel(),
-                /* getting current element if was refresh */
-                path            = DOM.getCurrentDirPath(panel),
-                wasRefresh      = path === json.path,
-                names           = ['file', 'path', 'link', 'pathLink'];
+            var names           = ['file', 'path', 'link', 'pathLink'];
             
             Files.get(names, function(error, templFile, templPath, templLink, templPathLink) {
-                var n, found, varCurrent, varName, current,
-                    Dialog  = DOM.Dialog,
+                var Dialog  = DOM.Dialog,
+                    current,
+                    panel   = panelParam || DOM.getPanel(),
                     dir     = DOM.getCurrentDirName(),
                     name    = DOM.getCurrentName(),
                     i       = panel.childNodes.length;
@@ -410,25 +406,10 @@ var Util, DOM, CloudFunc, join;
                         }
                     });
                     
-                    files           = DOM.getFiles(panel);
+                    current         = DOM.getCurrentFileByName(name);
                     
-                    /* searching current file */
-                    if (wasRefresh) {
-                        n = files.length;
-                        
-                        for (i = 0; i < n ; i++) {
-                            varCurrent  = files[i],
-                            varName     = DOM.getCurrentName(varCurrent);
-                            found       = varName === name;
-                            
-                            if (found) {
-                                current    = files[i];
-                                break;
-                            }
-                        }
-                    }
-                    if (!found) /* .. */
-                        current = files[0];
+                    if (!current) /* .. */
+                        current = DOM.getFiles(panel)[0];
                     
                     DOM.setCurrentFile(current, {
                         history: history
diff --git a/lib/client/dom.js b/lib/client/dom.js
index 74d70093..04fa0f61 100644
--- a/lib/client/dom.js
+++ b/lib/client/dom.js
@@ -691,8 +691,8 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
              */
             this.getCurrentFileByName       = function(name) {
                 var element,
-                    panel   = DOM.getPanel();
-
+                    panel   = CurrentInfo.panel;
+                
                 name    = 'js-file-' + name;
                 element = DOM.getByDataName(name, panel);