bug #4961 Javascript error when Designer is opened

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Jun 16, 2015 · a701f6e · a701f6e
1 parent f77e216
commit a701f6e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #4951 Trying to save chart as image crashes the browser
 - bug #4953 cant drag sql.gz file onto import input
 - bug #4960 Table creation results in GET request with missing server parameter that invalidates the session
+- bug #4961 Javascript error when Designer is opened
 
 4.4.9.0 (2015-06-04)
 - bug #4920 relation view doesn't list fields of table in other database

diff --git a/js/pmd/move.js b/js/pmd/move.js
@@ -358,7 +358,12 @@ function Re_load()
 
                     //alert(tab_hide_button.innerHTML);
                     if (tab_hide_button.innerHTML == 'v') {
-                        row_offset_top = document.getElementById(key2 + "." + key3).offsetTop;
+                        var fromColumn = document.getElementById(key2 + "." + key3);
+                        if (fromColumn) {
+                            row_offset_top = fromColumn.offsetTop;
+                        } else {
+                            continue;
+                        }
                     }
 
                     var y1 = document.getElementById(key2).offsetTop +
@@ -369,8 +374,13 @@ function Re_load()
                     row_offset_top = 0;
                     tab_hide_button = document.getElementById('id_hide_tbody_' + contr[K][key][key2][key3][0]);
                     if (tab_hide_button.innerHTML == 'v') {
-                        row_offset_top = document.getElementById(contr[K][key][key2][key3][0]
-                            + '.' + contr[K][key][key2][key3][1]).offsetTop;
+                        var toColumn = document.getElementById(contr[K][key][key2][key3][0]
+                            + '.' + contr[K][key][key2][key3][1]);
+                        if (toColumn) {
+                            row_offset_top = toColumn.offsetTop;
+                        } else {
+                            continue;
+                        }
                     }
 
                     var y2 =