gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

Browse Source
This commit is contained in:
Weblate 2015-02-13 18:11:03 +01:00
commit a09bba13a4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/console.js
View File

@ -185,9 +185,7 @@ var PMA_console = {
PMA_console.info();
break;
case 'show':
var pmaWindowScrollHead = $(window).scrollTop();
PMA_console.show(true);
$(window).scrollTop(pmaWindowScrollHead);
PMA_console.scrollBottom();
break;
}
@ -283,10 +281,10 @@ var PMA_console = {
PMA_console.$consoleContent.animate({'margin-bottom': 0},
'fast', 'easeOutQuart', function() {
$(window).trigger('resize');
if(inputFocus) {
PMA_consoleInput.focus();
}
});
if(inputFocus) {
PMA_consoleInput.focus();
}
},
/**
* Change console to SQL information mode
@ -309,9 +307,7 @@ var PMA_console = {
switch($.cookie('pma_console_mode')) {
case 'collapse':
case 'info':
var pmaWindowScrollHead = $(window).scrollTop();
PMA_console.show(true);
$(window).scrollTop(pmaWindowScrollHead);
break;
case 'show':
PMA_console.collapse();