diff --git a/lib/client.js b/lib/client.js index ab3e4568..dffd1b07 100644 --- a/lib/client.js +++ b/lib/client.js @@ -73,17 +73,12 @@ var Util, DOM, CloudFunc, CloudCmd; * @param pDirName - имя каталога с которого мы пришли */ function currentToParent(pDirName){ + var lRootDir; /* убираем слэш с имени каталога */ - pDirName = Util.removeStr(pDirName, '/'); + pDirName = Util.removeStr(pDirName, '/'); + lRootDir = DOM.getCurrentFileByName(pDirName); - /* опредиляем в какой мы панели: * - * правой или левой */ - var lPanel = DOM.getPanel(), - lRootDir = DOM.getById(pDirName + '(' + lPanel.id + ')'); - - /* if found li element with ID directory name * - * set it to current file */ - if(lRootDir){ + if (lRootDir){ DOM.setCurrentFile(lRootDir); DOM.scrollIntoViewIfNeeded(lRootDir, true); } diff --git a/lib/client/dom.js b/lib/client/dom.js index b247d5b4..1edc257b 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -1219,6 +1219,19 @@ var CloudCmd, Util, DOM, CloudFunc; return lRet; }; + /** + * get current file by name + */ + this.getCurrentFileByName = function(pName){ + var lRet, lPanel, lName; + + lPanel = DOM.getPanel(); + lName = pName + '(' + lPanel.id + ')'; + lRet = DOM.getById(lName); + + return lRet; + }; + /** * unified way to get current file *