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

Grid edit: fix bug - browse foreign value not work

Browse Source
This commit is contained in:
Aris Feryanto 2011-08-22 10:30:15 +08:00
parent 52648bbcf6
commit c19dae384a
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/makegrid.js
View File

@ -654,7 +654,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
g.isCellEditActive = false;
g.currentEditCell = null;
// destroy datepicker in edit area, if exist
$(g.cEdit).find('.hasDatepicker').datepicker('destroy');
var $dp = $(g.cEdit).find('.hasDatepicker');
if ($dp.length > 0) {
$dp.datepicker('destroy');
// change the cursor in edit box back to normal
// (the cursor become a hand pointer when we add datepicker)
$(g.cEdit).find('.edit_box').css('cursor', 'inherit');
}
},
/**
@ -785,11 +791,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
g.lastXHR = $.post('sql.php', post_params, function(data) {
g.lastXHR = null;
$editArea.removeClass('edit_area_loading');
// save original_data
var value = $(data.dropdown).val();
$td.data('original_data', value);
// update the text input field, in case where the "Relational display column" is checked
$(g.cEdit).find('.edit_box').val(value);
if ($(data.dropdown).is('select')) {
// save original_data
var value = $(data.dropdown).val();
$td.data('original_data', value);
// update the text input field, in case where the "Relational display column" is checked
$(g.cEdit).find('.edit_box').val(value);
}
$editArea.append(data.dropdown);
$editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
@ -942,6 +950,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
}
});
// cancel any click on the datepicker element
$editArea.find('> *').click(function(e) {
e.stopPropagation();
});
// force to restore modified $input_field value after adding datepicker
// (after adding a datepicker, the input field doesn't display the time anymore, only the date)
if (!is_null) {
@ -1572,9 +1585,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
e.preventDefault();
}
});
$(g.cEdit).find('.edit_area').click(function(e) {
e.stopPropagation();
});
$('html').click(function(e) {
// hide edit cell if the click is not from g.cEdit
if ($(e.target).parents().index(g.cEdit) == -1) {