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

phpmyadmin · Apr 8, 2015 · b7eec7d · b7eec7d
2 parents 745475b + 3099f28
commit b7eec7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #4839 DOC link in setting is broken
 - bug #4841 Status page: Mislukte pogingen per uur value is incorrect
 - bug       MIME Transformation link fixed
+- bug #4838 Prevents console window from moving out of the screen height
 
 4.4.1.1 (2015-04-08)
 - bug #4846 Web server's error log is flooded

diff --git a/js/console.js b/js/console.js
@@ -432,6 +432,9 @@ var PMA_consoleResizer = {
      * @return void
      */
     _mousemove: function(event) {
+        if (event.pageY < 35) {
+            event.pageY = 35
+        }
         PMA_consoleResizer._resultHeight = PMA_consoleResizer._height + (PMA_consoleResizer._posY -event.pageY);
         // Content min-height is 32, if adjusting height small than it we'll move it out of the page
         if(PMA_consoleResizer._resultHeight <= 32) {