From 9e105f56bd85eb91fe456f4bb3294fd09d0d318e Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 3 Jun 2013 03:36:58 -0400 Subject: [PATCH] moved CloudCmd.KEY object data to prototype of CloudCmd.Key --- ChangeLog | 2 + lib/client/editor/_ace.js | 6 +-- lib/client/editor/_codemirror.js | 2 +- lib/client/key.js | 63 ++++++++++++++++---------------- lib/client/menu.js | 5 +-- lib/client/terminal.js | 5 +-- lib/client/viewer.js | 5 +-- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e9b72ca..b758edec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,8 @@ dispatch * Functions maked private: ajaxload, changeLinks, createFileTable, getJSONfromFileTable. +* Moved CloudCmd.KEY object data to prototype of CloudCmd.Key. + 2012.04.22, v0.2.0 diff --git a/lib/client/editor/_ace.js b/lib/client/editor/_ace.js index 989f68be..c0f15ca9 100644 --- a/lib/client/editor/_ace.js +++ b/lib/client/editor/_ace.js @@ -170,9 +170,9 @@ var CloudCmd, CloudFunc, ace; /* если клавиши можно обрабатывать */ if( lBinded ){ /* if f4 or f3 pressed */ - var lF3 = cloudcmd.KEY.F3; - var lF4 = cloudcmd.KEY.F4; - var lShow = Util.bind(lThis.show, lThis); + var lF3 = Key.F3, + lF4 = Key.F4, + lShow = Util.bind(lThis.show, lThis); if(!pEvent.shiftKey){ if(pEvent.keyCode === lF4) diff --git a/lib/client/editor/_codemirror.js b/lib/client/editor/_codemirror.js index 361897bd..d5bf2f3a 100644 --- a/lib/client/editor/_codemirror.js +++ b/lib/client/editor/_codemirror.js @@ -191,7 +191,7 @@ var CloudCmd, Util, DOM, CodeMirror; var lIsBind = Key.isBind(); if (lIsBind) { - var lF4 = CloudCmd.KEY.F4, + var lF4 = Key.F4, lKey = pEvent.keyCode; if(lKey === lF4) diff --git a/lib/client/key.js b/lib/client/key.js index 4f02f60b..f12b5eb3 100644 --- a/lib/client/key.js +++ b/lib/client/key.js @@ -2,7 +2,7 @@ var CloudCmd, Util, DOM; (function(CloudCmd, Util, DOM){ 'use strict'; - CloudCmd.KEY = { + var KEY = { TAB : 9, ENTER : 13, ESC : 27, @@ -43,10 +43,12 @@ var CloudCmd, Util, DOM; TRA : 192 /* Typewritten Reverse Apostrophe (`) */ }; + KeyProto.prototype = KEY; CloudCmd.Key = new KeyProto(); function KeyProto(){ - var Binded, + var Key = this, + Binded, lTabPanel = { left : 0, right : 0 @@ -69,7 +71,6 @@ var CloudCmd, Util, DOM; function listener(pEvent){ /* получаем выдленный файл*/ var i, n, lCurrent = DOM.getCurrentFile(), - KEY = CloudCmd.KEY, lKeyCode = pEvent.keyCode, lShift = pEvent.shiftKey, lAlt = pEvent.altKey, @@ -77,7 +78,7 @@ var CloudCmd, Util, DOM; /* если клавиши можно обрабатывать*/ if(Binded){ switch(lKeyCode){ - case KEY.TAB: + case Key.TAB: /* changing parent panel of curent-file */ var lPanel = DOM.getPanel(), lId = lPanel.id; @@ -98,12 +99,12 @@ var CloudCmd, Util, DOM; DOM.preventDefault(pEvent);//запрет на дальнейшее действие break; - case KEY.INSERT: + case Key.INSERT: DOM.setSelectedFile( lCurrent ); DOM.setCurrentFile( lCurrent.nextSibling ); break; - case KEY.DELETE: + case Key.DELETE: if(lShift){ var lUrl = DOM.getCurrentPath(lCurrent); @@ -118,60 +119,60 @@ var CloudCmd, Util, DOM; DOM.promptDeleteSelected(lCurrent); break; - case KEY.F1: + case Key.F1: DOM.preventDefault(pEvent); break; - case KEY.F2: + case Key.F2: DOM.renameCurrent(lCurrent); break; - case KEY.F3: + case Key.F3: Util.exec(CloudCmd.Viewer); DOM.preventDefault(pEvent); break; - case KEY.F4: + case Key.F4: DOM.Images.showLoad(); Util.exec(CloudCmd.Editor); DOM.preventDefault(pEvent); break; - case KEY.F5: + case Key.F5: DOM.copyCurrent(lCurrent); DOM.preventDefault(pEvent); break; - case KEY.F6: + case Key.F6: DOM.moveCurrent(lCurrent); DOM.preventDefault(pEvent); break; - case KEY.F7: + case Key.F7: DOM.promptNewDir(); break; - case KEY.F8: + case Key.F8: DOM.promptDeleteSelected(lCurrent); break; - case KEY.F: + case Key.F: DOM.promptDeleteCurrent(lCurrent); break; - case KEY.F10: + case Key.F10: if(lShift){ Util.exec(CloudCmd.Menu); DOM.preventDefault(pEvent); } break; - case KEY.TRA: + case Key.TRA: DOM.Images.showLoad({top: true}); Util.exec(CloudCmd.Terminal); break; - case KEY.SPACE: + case Key.SPACE: var lSelected = DOM.isSelected(lCurrent), lDir = DOM.isCurrentIsDir(lCurrent), lName = DOM.getCurrentName(lCurrent); @@ -192,7 +193,7 @@ var CloudCmd, Util, DOM; /* навигация по таблице файлов * * если нажали клавишу вверх * * выделяем предыдущую строку */ - case KEY.UP: + case Key.UP: if(lShift) DOM.setSelectedFile(lCurrent); @@ -202,7 +203,7 @@ var CloudCmd, Util, DOM; /* если нажали клавишу в низ * * выделяем следующую строку */ - case KEY.DOWN: + case Key.DOWN: if(lShift) DOM.setSelectedFile(lCurrent); @@ -213,21 +214,21 @@ var CloudCmd, Util, DOM; /* если нажали клавишу Home * * переходим к самому верхнему * * элементу */ - case KEY.HOME: + case Key.HOME: DOM.setCurrentFile( lCurrent.parentElement.firstChild ); DOM.preventDefault(pEvent); break; /* если нажали клавишу End * выделяем последний элемент */ - case KEY.END: + case Key.END: DOM.setCurrentFile( lCurrent.parentElement.lastElementChild ); DOM.preventDefault( pEvent ); break; /* если нажали клавишу page down * проматываем экран */ - case KEY.PAGE_DOWN: + case Key.PAGE_DOWN: DOM.scrollByPages( DOM.getPanel(), 1 ); for(i=0; i<30; i++){ @@ -240,7 +241,7 @@ var CloudCmd, Util, DOM; break; /* если нажали клавишу page up проматываем экран */ - case KEY.PAGE_UP: + case Key.PAGE_UP: DOM.scrollByPages( DOM.getPanel(), -1 ); var lC = lCurrent, @@ -264,12 +265,12 @@ var CloudCmd, Util, DOM; break; /* открываем папку*/ - case KEY.ENTER: + case Key.ENTER: if( DOM.isCurrentIsDir() ) Util.exec( CloudCmd.loadDir() ); break; - case KEY.A: + case Key.A: if(pEvent.ctrlKey){ var lParent = lCurrent.parentElement, lNodes = lParent.childNodes; @@ -288,7 +289,7 @@ var CloudCmd, Util, DOM; * при этом данные берём всегда с * сервера, а не из кэша * (обновляем кэш)*/ - case KEY.R: + case Key.R: if(lCtrl){ Util.log('+r pressed\n' + 'reloading page...\n' + @@ -300,7 +301,7 @@ var CloudCmd, Util, DOM; break; /* чистим кэш */ - case KEY.D: + case Key.D: if(lCtrl){ Util.log('+d pressed\n' + 'clearing cache...\n' + @@ -313,7 +314,7 @@ var CloudCmd, Util, DOM; /* убираем все обработчики * нажатий клавиш */ - case KEY.Q: + case Key.Q: if(lAlt){ Util.log('+q pressed\n' + '+r reload key-handerl - removed' + @@ -331,7 +332,7 @@ var CloudCmd, Util, DOM; /* устанавливаем все обработчики * нажатий клавиш */ - else if(lKeyCode === KEY.S && lAlt){ + else if(lKeyCode === Key.S && lAlt){ /* обрабатываем нажатия на клавиши*/ Binded = true; Util.log('+s pressed\n' + @@ -340,7 +341,7 @@ var CloudCmd, Util, DOM; 'press +q to remove them'); DOM.preventDefault(pEvent); } - }; + } } })(CloudCmd, Util, DOM); \ No newline at end of file diff --git a/lib/client/menu.js b/lib/client/menu.js index 7eae56d0..a202363f 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -294,9 +294,8 @@ var CloudCmd, Util, DOM, CloudFunc, $; DOM.Events.addKey( lListener ); function lListener(pEvent){ - var lKEY = CloudCmd.KEY, - lF10 = lKEY.F10, - lESC = lKEY.ESC, + var lF10 = Key.F10, + lESC = Key.ESC, lKey = pEvent.keyCode, lShift = pEvent.shiftKey, lIsBind = Key.isBind(); diff --git a/lib/client/terminal.js b/lib/client/terminal.js index df039658..cd2ccf96 100644 --- a/lib/client/terminal.js +++ b/lib/client/terminal.js @@ -112,9 +112,8 @@ var CloudCmd, Util, DOM, $; function lListener(pEvent){ var lRet = true, - lKEY = CloudCmd.KEY, - lESC = lKEY.ESC, - lTRA = lKEY.TRA, + lESC = Key.ESC, + lTRA = Key.TRA, lKey = pEvent.keyCode, lIsBind = Key.isBind(); diff --git a/lib/client/viewer.js b/lib/client/viewer.js index 54c6021f..416d7990 100644 --- a/lib/client/viewer.js +++ b/lib/client/viewer.js @@ -132,9 +132,8 @@ var CloudCmd, Util, DOM, CloudFunc, $; } function lListener(pEvent){ - var lKEY = CloudCmd.KEY, - lF3 = lKEY.F3, - lF1 = lKEY.F1, + var lF3 = Key.F3, + lF1 = Key.F1, lIsBind = Key.isBind(), lKey = pEvent.keyCode;