Merge branch 'QA_4_3'

This commit is contained in:
Marc Delisle 2014-12-22 07:33:02 -05:00
commit 44060b77c9
2 changed files with 3 additions and 2 deletions

View File

@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
4.3.4.0 (not yet released)
- bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
- bug #4661 Drag and drop file import always fails
- bug #4651 don't open console with esc
4.3.3.0 (2014-12-21)
- bug The "Recently used tables" setting should be with Nav panel

View File

@ -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();
}
});