From 7efe1259162927bad46edb9115a4af008387bbd2 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 25 Feb 2014 03:44:51 -0500 Subject: [PATCH] refactor(dom) deleteCurrent --- lib/client/dom.js | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/lib/client/dom.js b/lib/client/dom.js index 62000602..5f895e02 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -1553,27 +1553,33 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; /** * remove current file from file table - * @pCurrent + * @param current + * @param notSet + * */ - this.deleteCurrent = function(pCurrent, pNextFile, pPreviousFile, pNotSet) { - var lCurrent = pCurrent || Cmd.getCurrentFile(), - lParent = lCurrent && lCurrent.parentElement, - lName = Cmd.getCurrentName(lCurrent); + this.deleteCurrent = function(current, notSet) { + var name, next, prev, parent; - if (lCurrent && lParent && lName !== '..') { - var lNext = pNextFile || lCurrent.nextSibling, - lPrevious = pPreviousFile || lCurrent.previousSibling; + if (!current) + Cmd.getCurrentFile(); + + parent = current && current.parentElement; + name = Cmd.getCurrentName(current); + + if (current && name !== '..') { + next = current.nextSibling, + prev = current.previousSibling; - if (!pNotSet) - if (lNext) - this.setCurrentFile(lNext); - else if (lPrevious) - this.setCurrentFile(lPrevious); - - lParent.removeChild(lCurrent); + if (!notSet) + if (next) + this.setCurrentFile(next); + else if (prev) + this.setCurrentFile(prev); + + parent.removeChild(current); } - return lCurrent; + return current; }; /** @@ -1594,7 +1600,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; next = current.nextSibling, prev = current.previousSibling; - this.deleteCurrent(current, next, prev, i !== n-1); + this.deleteCurrent(current, i !== n-1); } }