Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-02-10 06:06:00 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-02-10 06:06:00 +0300
commit4c8bc68ef10e110506e06ced0ba9e5408792e323 (patch)
treecd4b3c2fa6fab9b009baac780cd8a814d9eb563e /js/console.js
parent09539d41e6ce4eca62ff02b0ecd47bcbfe3c2fee (diff)
Simplify the fix for bug #4744
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'js/console.js')
-rw-r--r--js/console.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/js/console.js b/js/console.js
index 4002308fab..4cd883c56d 100644
--- a/js/console.js
+++ b/js/console.js
@@ -192,9 +192,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;
}
@@ -282,7 +280,6 @@ var PMA_console = {
PMA_console.collapse();
return;
}
- PMA_console.$consoleContent.css({display:'block'});
if(PMA_console.$consoleToolbar.hasClass('collapsed')) {
PMA_console.$consoleToolbar.removeClass('collapsed');
}
@@ -290,6 +287,7 @@ var PMA_console = {
PMA_console.$consoleContent.stop();
PMA_console.$consoleContent.animate({'margin-bottom': 0},
'fast', 'easeOutQuart', function() {
+ PMA_console.$consoleContent.css({display:'block'});
$(window).trigger('resize');
});
if(inputFocus) {
@@ -317,9 +315,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();