diff --git a/ChangeLog b/ChangeLog index 79e28542..9b4b9041 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,8 @@ dispatch * Added tryCatch to fs.watch in cloudcmd.js. +* Set F3 to veiw. + 2012.04.22, v0.2.0 diff --git a/README.md b/README.md index a14e6ca0..528ef9e8 100644 --- a/README.md +++ b/README.md @@ -66,12 +66,11 @@ There is a short list: Viewer's hot keys --------------- -- **Shift + F3** - open viewer window +- **F3** - open viewer window - **Esc** - close viewer window Editor's hot keys --------------- -- **F3** - open CodeMirror editor in read only mode - **F4** - open CodeMirror editor - **Ctrl + s** - save file - **Esc** - close CodeMirror editor diff --git a/lib/client/editor/_codemirror.js b/lib/client/editor/_codemirror.js index bd152e5e..149b7bd2 100644 --- a/lib/client/editor/_codemirror.js +++ b/lib/client/editor/_codemirror.js @@ -1,6 +1,6 @@ var CloudCmd, Util, DOM, CodeMirror; -/* object contains editors CodeMirror */ - (function(CloudCmd, Util, DOM){ + +(function(CloudCmd, Util, DOM){ 'use strict'; var KeyBinding = CloudCmd.KeyBinding, @@ -132,8 +132,6 @@ var CloudCmd, Util, DOM, CodeMirror; Loading = true; - var lFalseLoading = function(){ Loading = false; }; - setTimeout(lFalseLoading, 400); DOM.getCurrentData({ @@ -149,17 +147,18 @@ var CloudCmd, Util, DOM, CodeMirror; } }); } + + function lFalseLoading(){ Loading = false; } } /** * function hides CodeMirror editor */ function hide() { - var lElem = CodeMirrorElement; KeyBinding.set(); - if(lElem && FM) - FM.removeChild(lElem); + if(CodeMirrorElement && FM) + FM.removeChild(CodeMirrorElement); DOM.showPanel(); } @@ -180,36 +179,24 @@ var CloudCmd, Util, DOM, CodeMirror; /** * function bind keys */ - CloudCmd.Editor.init = function(pReadOnly){ - ReadOnly = pReadOnly; - + CloudCmd.Editor.init = function(){ CodeMirrorEditor.show(); CallBacks.pop(); - var lKeyListener = function(pEvent){ - /* если клавиши можно обрабатывать */ - if( KeyBinding.get() ){ - var lF3 = CloudCmd.KEY.F3, - lF4 = CloudCmd.KEY.F4; - - if(!pEvent.shiftKey) - switch(pEvent.keyCode) - { - case lF4: - ReadOnly = false; - CodeMirrorEditor.show(); - break; - case lF3: - ReadOnly = true; - CodeMirrorEditor.show(); - break; - } - } - }; - /* добавляем обработчик клавишь */ DOM.Events.addKey( lKeyListener ); DOM.setButtonKey('f4', CodeMirrorEditor.show); + + function lKeyListener(pEvent){ + /* если клавиши можно обрабатывать */ + if( KeyBinding.get() ){ + var lF4 = CloudCmd.KEY.F4, + lKey = pEvent.keyCode; + + if(lKey === lF4) + CodeMirrorEditor.show(); + } + } }; CloudCmd.Editor.CodeMirror = CodeMirrorEditor; diff --git a/lib/client/keyBinding.js b/lib/client/keyBinding.js index 3b441de6..70471c09 100644 --- a/lib/client/keyBinding.js +++ b/lib/client/keyBinding.js @@ -127,9 +127,7 @@ var CloudCmd, Util, DOM; break; case KEY.F3: - var lEditor = CloudCmd[lShift ? 'Viewer' : 'Editor']; - - Util.exec(lEditor, true); + Util.exec(CloudCmd.Viewer); DOM.preventDefault(pEvent); break; diff --git a/lib/client/viewer.js b/lib/client/viewer.js index c1f2fa37..b7c8d7a3 100644 --- a/lib/client/viewer.js +++ b/lib/client/viewer.js @@ -123,26 +123,27 @@ var CloudCmd, Util, DOM, CloudFunc, $; DOM.jqueryLoad ]); - var lView = function(){ + DOM.Events.addKey(lKeyListener); + DOM.setButtonKey('f3', lView); + + function lView(){ DOM.Images.showLoad(); FancyBox.show( DOM.getCurrentFile() ); - }; + } - var lKeyListener = function(pEvent){ + function lKeyListener(pEvent){ var lKEY = CloudCmd.KEY, lF3 = lKEY.F3, + F1 = lKEY.F1, lKeyBinded = KeyBinding.get(), - lKeyCode = pEvent.keyCode, - lShift = pEvent.shiftKey; + lKeyCode = pEvent.keyCode; /* если клавиши можно обрабатывать */ if( lKeyBinded){ switch(lKeyCode){ case lF3: - if(lShift){ - lView(); - DOM.preventDefault(pEvent); - } + lView(); + DOM.preventDefault(pEvent); break; case lKEY.F1: @@ -150,11 +151,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; break; } } - }; - - /* добавляем обработчик клавишь */ - DOM.Events.addKey(lKeyListener); - DOM.setButtonKey('f3', lView); + } }; CloudCmd.Viewer.FancyBox = FancyBox;