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-09 17:53:28 +01:00
commit 196ae2f0af
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
4.3.10.0 (not yet released)
- bug Undefined index navwork
- bug #4744 Opening console scroll down the page
4.3.9.0 (2015-02-05)
- bug #4728 Incorrect headings in routine editor

4
js/console.js
View File

@ -185,7 +185,9 @@ var PMA_console = {
PMA_console.info();
break;
case 'show':
var pmaWindowScrollHead = $(window).scrollTop();
PMA_console.show(true);
$(window).scrollTop(pmaWindowScrollHead);
PMA_console.scrollBottom();
break;
}
@ -307,7 +309,9 @@ 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();