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
path: root/js/pmd
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-06-16 09:38:57 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-06-16 09:38:57 +0300
commita701f6e084f1e5b1555661dc24de43dcdc16c156 (patch)
treedaf74ae0a832f60454a82e807742a264ed66c5fa /js/pmd
parentf77e216b362fbeac051560384349042c57187695 (diff)
bug #4961 Javascript error when Designer is opened
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'js/pmd')
-rw-r--r--js/pmd/move.js16
1 files changed, 13 insertions, 3 deletions
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 1cef6fa4c9..0d86fa1918 100644
--- 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 =