diff --git a/lib/client.js b/lib/client.js index 79db67ca..8dd49b0b 100644 --- a/lib/client.js +++ b/lib/client.js @@ -77,7 +77,8 @@ var Util, DOM, CloudFunc, join; /* загружаем содержимое каталога */ ajaxLoad(link, { refresh : isRefresh, - history : history + history : history, + noCurrent : params.noCurrent }, panel, callback); }; @@ -298,17 +299,23 @@ var Util, DOM, CloudFunc, join; }); }; - this.refresh = function(panelParam, callback) { + this.refresh = function(panelParam, options, callback) { var panel = panelParam || Info.panel, NEEDREFRESH = true, path = DOM.getCurrentDirPath(panel), notSlashlLink = CloudFunc.rmLastSlash(path); + if (!callback) { + callback = options; + options = {}; + } + CloudCmd.loadDir({ path : notSlashlLink, isRefresh : NEEDREFRESH, history : false, - panel : panel + panel : panel, + noCurrent : options.noCurrent }, callback); }; @@ -328,6 +335,7 @@ var Util, DOM, CloudFunc, join; name = Info.name, obj = Util.json.parse(json), isRefresh = options.refresh, + noCurrent = options.noCurrent, history = options.history; if (!isRefresh && json) @@ -337,7 +345,7 @@ var Util, DOM, CloudFunc, join; createFileTable(obj, panel, history, function() { var current; - if (isRefresh) { + if (isRefresh && !noCurrent) { current = DOM.getCurrentByName(name); DOM.setCurrentFile(current); } diff --git a/lib/client/dom.js b/lib/client/dom.js index 3f316036..94749bc1 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -1642,9 +1642,8 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; DOM.setCurrentFile(current); }; - CloudCmd.refresh(panelPassive, function() { - CloudCmd.refresh(panel, setCurrent); - }); + CloudCmd.refresh(panelPassive, {noCurrent: true}); + CloudCmd.refresh(panel, setCurrent); }); }); }