gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_4'

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-06-16 12:10:24 +05:30
commit 29e68ddccf
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -64,6 +64,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

16
js/pmd/move.js
View File

@ -363,7 +363,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 +
@ -374,8 +379,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 =