From 23f61acfb918645ed37a035acf3da7fc16b79f19 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 21 Jan 2014 05:52:32 -0500 Subject: [PATCH] refactor(key) lCurrent -> current --- lib/client/key.js | 72 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/lib/client/key.js b/lib/client/key.js index 85e0b73e..03a7f3b7 100644 --- a/lib/client/key.js +++ b/lib/client/key.js @@ -58,9 +58,9 @@ var CloudCmd, Util, DOM; function KeyProto() { var Key = this, Binded, - lTabPanel = { - left : 0, - right : 0 + TabPanel = { + 'js-left' : null, + 'js-right' : null }; this.isBind = function() {return Binded;}; @@ -111,7 +111,7 @@ var CloudCmd, Util, DOM; skipCount = 0, skipN = 0, setted = false, - lCurrent = Info.element, + current = Info.element, panel = Info.panel, files = Info.files, SMALL = 32, @@ -131,8 +131,8 @@ var CloudCmd, Util, DOM; n = files.length; for (i = 0; i < n; i++) { - lCurrent = files[i]; - name = DOM.getCurrentName(lCurrent); + current = files[i]; + name = DOM.getCurrentName(current); isContain = Util.isContainStrAtBegin(name, [char, charSmall]); if (isContain) { @@ -158,11 +158,12 @@ var CloudCmd, Util, DOM; } function switchKey(pEvent) { - var i, n, - lCurrent = Info.element, + var i, n, id, + current = Info.element, panel = Info.panel, - prev = lCurrent.previousSibling, - next = lCurrent.nextSibling, + filesPassive = Info.filesPassive, + prev = current.previousSibling, + next = current.nextSibling, lKeyCode = pEvent.keyCode, lShift = pEvent.shiftKey, lAlt = pEvent.altKey, @@ -170,29 +171,26 @@ var CloudCmd, Util, DOM; switch (lKeyCode) { case Key.TAB: - var lFirstFileOnList, id; - id = panel.id; - lTabPanel[id] = lCurrent; + TabPanel[id] = current; panel = Info.panelPassive; id = panel.id; - lCurrent = lTabPanel[id]; + current = TabPanel[id]; - if (lCurrent && lCurrent.parentElement) - DOM.setCurrentFile(lCurrent); + if (current && current.parentElement) + DOM.setCurrentFile(current); else { - lFirstFileOnList = DOM.getByTag('li', panel)[2]; - - DOM.setCurrentFile(lFirstFileOnList); + current = filesPassive[0]; + DOM.setCurrentFile(current); } DOM.preventDefault(pEvent);//запрет на дальнейшее действие break; case Key.INSERT: - DOM .toggleSelectedFile(lCurrent) + DOM .toggleSelectedFile(current) .setCurrentFile(next); break; @@ -204,15 +202,15 @@ var CloudCmd, Util, DOM; path += '?dir'; DOM.RESTful.delete(path, function() { - DOM.deleteCurrent(lCurrent); + DOM.deleteCurrent(current); }); } else - DOM.promptDeleteSelected(lCurrent); + DOM.promptDeleteSelected(current); break; case Key.ASTERISK: - DOM.toggleAllSelectedFiles(lCurrent); + DOM.toggleAllSelectedFiles(current); break; case Key.PLUS: @@ -229,7 +227,7 @@ var CloudCmd, Util, DOM; break; case Key.F2: - DOM.renameCurrent(lCurrent); + DOM.renameCurrent(current); break; case Key.F3: @@ -243,12 +241,12 @@ var CloudCmd, Util, DOM; break; case Key.F5: - DOM.copyCurrent(lCurrent); + DOM.copyCurrent(current); DOM.preventDefault(pEvent); break; case Key.F6: - DOM.moveCurrent(lCurrent); + DOM.moveCurrent(current); DOM.preventDefault(pEvent); break; @@ -257,7 +255,7 @@ var CloudCmd, Util, DOM; break; case Key.F8: - DOM.promptDeleteSelected(lCurrent); + DOM.promptDeleteSelected(current); break; case Key.F9: @@ -290,9 +288,9 @@ var CloudCmd, Util, DOM; lSelected = Info.isSelected; Util.ifExec(lSelected, function() { - DOM.toggleSelectedFile(lCurrent); + DOM.toggleSelectedFile(current); }, function(pCallBack) { - DOM.loadCurrentSize(pCallBack, lCurrent); + DOM.loadCurrentSize(pCallBack, current); }); @@ -304,7 +302,7 @@ var CloudCmd, Util, DOM; * выделяем предыдущую строку */ case Key.UP: if (lShift) - DOM.toggleSelectedFile(lCurrent); + DOM.toggleSelectedFile(current); DOM.setCurrentFile(prev); DOM.preventDefault(pEvent); @@ -313,7 +311,7 @@ var CloudCmd, Util, DOM; /* если нажали клавишу в низ - выделяем следующую строку */ case Key.DOWN: if (lShift) - DOM.toggleSelectedFile(lCurrent); + DOM.toggleSelectedFile(current); DOM.setCurrentFile(next); DOM.preventDefault(pEvent); @@ -339,12 +337,12 @@ var CloudCmd, Util, DOM; for (i = 0; i < 30; i++) { - if (!lCurrent.nextSibling) + if (!current.nextSibling) break; - lCurrent = lCurrent.nextSibling; + current = current.nextSibling; } - DOM.setCurrentFile(lCurrent); + DOM.setCurrentFile(current); DOM.preventDefault(pEvent); break; @@ -363,13 +361,13 @@ var CloudCmd, Util, DOM; }; for (i = 0; i < 30; i++) { - if (!lCurrent.previousSibling || tryCatch(lCurrent) ) + if (!current.previousSibling || tryCatch(current) ) break; - lCurrent = lCurrent.previousSibling; + current = current.previousSibling; } - DOM.setCurrentFile(lCurrent); + DOM.setCurrentFile(current); DOM.preventDefault(pEvent); break;