diff --git a/lib/client/keyBinding.js b/lib/client/keyBinding.js index 672b6e01..073ac15d 100644 --- a/lib/client/keyBinding.js +++ b/lib/client/keyBinding.js @@ -81,23 +81,19 @@ CloudCommander.keyBinding = (function(){ } - /* if f3 pressed */ - else if(event.keyCode === lKEY.F3 && !event.shiftKey){ - if (typeof CloudCommander.Editor === 'function') - CloudCommander.Editor(true); + /* if f3 or shift+f3 pressed */ + else if(event.keyCode === lKEY.F3){ + if(event.shiftKey){ + if (typeof CloudCommander.Viewer === 'function') + CloudCommander.Viewer(); + + else if (typeof CloudCommander.Editor === 'function') + CloudCommander.Editor(true); + } event.preventDefault();//запрет на дальнейшее действие } - - /* if + f3 pressed */ - else if(event.keyCode === lKEY.F3 && - event.shiftKey){ - if (typeof CloudCommander.Viewer === 'function') - CloudCommander.Viewer(); - - event.preventDefault();//запрет на дальнейшее действие - } - + /* if alt+f3 pressed */ else if(event.keyCode === lKEY.F3 && event.altKey){ diff --git a/lib/client/menu.js b/lib/client/menu.js index ea35c299..eaf1a910 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -97,7 +97,7 @@ CloudCommander.Menu.load = (function(pParent, pPosition){ }); }; - var lSrc = pParent.dir +'jquery.contextMenu.css'; + var lSrc = pParent.dir + 'jquery.contextMenu.css'; pParent.cssLoad({ src : lSrc, @@ -194,16 +194,16 @@ CloudCommander.Menu.Keys = (function(pPosition){ "use strict"; var key_event = (function(){ - return function(event){ + return function(pEvent){ /* если клавиши можно обрабатывать */ if(CloudCommander.keyBinded) /* if shift + F10 pressed */ - if(event.keyCode === CloudCommander.KEY.F10 && - event.shiftKey){ + if(pEvent.keyCode === CloudCommander.KEY.F10 && + pEvent.shiftKey){ CloudCommander.Menu.show(); - event.preventDefault(); - } + pEvent.preventDefault(); + } }; });