diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2014-12-22 13:48:27 +0300 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2014-12-22 15:32:05 +0300 |
| commit | 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae (patch) | |
| tree | 7181afc2ec950286bbdc764b9354cd289ebc30af /js/console.js | |
| parent | fbe587ce7386de47f728ad8c8f167fc945e18501 (diff) | |
Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
Diffstat (limited to 'js/console.js')
| -rw-r--r-- | js/console.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/console.js b/js/console.js index d832297001..5f21b645d5 100644 --- a/js/console.js +++ b/js/console.js @@ -119,8 +119,8 @@ var PMA_console = { PMA_console.$consoleToolbar.children('.console_switch').click(PMA_console.toggle); $(document).keydown(function(event) { - // 27 keycode is ESC - if(event.keyCode === 27) { + // Ctrl + Alt + C + if(event.ctrlKey && event.altKey && event.keyCode === 67) { PMA_console.toggle(); } }); |