From f180824158c5cd12da7ff07f6a50eb09090e03db Mon Sep 17 00:00:00 2001
From: Achilles-96 <raghuram.vadapalli@research.iiit.ac.in>
Date: Tue, 21 Jun 2016 12:27:33 +0530
Subject: [PATCH 1/2] Fixes #12330 - Shortcut for closing console

Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
---
 js/shortcuts_handler.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/js/shortcuts_handler.js b/js/shortcuts_handler.js
index c30e18f813..530a1bd9ee 100644
--- a/js/shortcuts_handler.js
+++ b/js/shortcuts_handler.js
@@ -43,6 +43,11 @@ $(document).ready(function() {
             PMA_console.toggle();
         }
 
+        if( e.ctrlKey && e.keyCode == keyK ) {
+            e.preventDefault();
+            PMA_console.toggle();
+        }
+
         if( e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' || e.target.nodeName === 'SELECT' ) {
             return;
         }
@@ -53,6 +58,7 @@ $(document).ready(function() {
             databaseOp = true;
         }
         else if(e.keyCode === keyK) {
+            e.preventDefault();
             PMA_console.toggle();
         }
         else if(e.keyCode === keyS) {

From 84d5c028b294163272c0854eae55f544c3bc0497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 17 Aug 2016 13:07:41 +0200
Subject: [PATCH 2/2] Changelog for issue #12330
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Shortcut for closing console

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index bf3f75b79b..494a9938d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog
 - issue        Removed MySQL connection retry without password
 - issue #12218 Allow to specify further parameters for control connection
 - issue #12162 Show charset for each table on Database structure page
+- issue #12330 Shortcut for closing console
 
 4.6.5 (not yet released)
 - issue        Remove potentionally license problematic sRGB profile