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

Grid edit: fix bug - error when editing foreign values that must be browsed

Browse Source
This commit is contained in:
Aris Feryanto 2011-07-22 11:15:31 +08:00
parent 4d9715e6ca
commit 9c06a33982
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/makegrid.js
View File

@ -887,9 +887,9 @@
}
// results from Browse foreign value
$test_element = $(g.cEdit).find('textarea');
$test_element = $(g.cEdit).find('span.curr_value');
if ($test_element.length != 0) {
this_field_params[field_name] = $test_element.val();
this_field_params[field_name] = $test_element.text();
}
if($this_field.is('.relation')) {
@ -1227,13 +1227,15 @@
g.showEditCell(this);
})
.click(function(e) {
if (g.isCellEditActive) {
g.postEditedCell();
e.stopPropagation();
} else {
g.showEditCell(this);
$(g.cEdit).find('input[type=text]').focus();
e.stopPropagation();
if (g.isInEditMode) {
if (g.isCellEditActive) {
g.postEditedCell();
e.stopPropagation();
} else {
g.showEditCell(this);
$(g.cEdit).find('input[type=text]').focus();
e.stopPropagation();
}
}
});
$(g.cEdit).find('input[type=text]').focus(function(e) {
@ -1255,14 +1257,12 @@
e.preventDefault();
}
});
$(g.cEdit).click(function(e) {
// prevent click to be handled by $('html').click below
e.stopPropagation();
});
$('html').click(function(e) {
// post edited cell
if (g.isCellEditActive) {
g.postEditedCell();
// hide edit cell if the click is not from g.cEdit
if ($(e.target).parents().index(g.cEdit) == -1) {
if (g.isCellEditActive) {
g.hideEditCell();
}
}
});
// add table class