Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
This commit is contained in:
@@ -101,10 +101,13 @@ function setDb(new_db) {
|
||||
var old_db = db;
|
||||
db = new_db;
|
||||
|
||||
// the db name as an id exists only when LeftFrameLight is false
|
||||
if (window.frame_navigation.document.getElementById(db) == null) {
|
||||
// happens when LeftFrameLight is true
|
||||
// db is unknown, reload complete left frame
|
||||
refreshNavigation();
|
||||
} else {
|
||||
// happens when LeftFrameLight is false
|
||||
unmarkDbTable(old_db);
|
||||
markDbTable(db);
|
||||
}
|
||||
|
@@ -867,9 +867,9 @@ function PMA_markRowsInit() {
|
||||
checkbox.checked = marked_row[unique_id];
|
||||
if (typeof(event) == 'object') {
|
||||
table = this.parentNode;
|
||||
i = 0;
|
||||
while (table.tagName.toLowerCase() != 'table' && i < 20) {
|
||||
i++;
|
||||
parentTableLimit = 0;
|
||||
while (table.tagName.toLowerCase() != 'table' && parentTableLimit < 20) {
|
||||
parentTableLimit++;
|
||||
table = table.parentNode;
|
||||
}
|
||||
|
||||
@@ -884,7 +884,7 @@ function PMA_markRowsInit() {
|
||||
}
|
||||
|
||||
while (i != this.rowIndex) {
|
||||
table.rows[i].onmousedown();
|
||||
$(table.rows[i]).mousedown();
|
||||
if (i < this.rowIndex) {
|
||||
i++;
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user