The branch, master has been updated via ebb47823a235c64c4f0200204cf5dfcb8b9f6604 (commit) via e10a42596109034a19901e37e188ed47c3b2abce (commit) via 2b4acfa534835b7e41eaeb583c761c4312fd8488 (commit) via f82ad2318cc90bcff6e3624af704a769738e3e99 (commit) from dbb1b8a17ffd362339bb9697e7fb9def7df250d2 (commit)
- Log ----------------------------------------------------------------- commit ebb47823a235c64c4f0200204cf5dfcb8b9f6604 Merge: dbb1b8a e10a425 Author: Marc Delisle marc@infomarc.info Date: Tue Aug 23 08:11:51 2011 -0400
Merge commit 'e10a42596109034a19901e37e188ed47c3b2abce'
commit e10a42596109034a19901e37e188ed47c3b2abce Merge: 2b4acfa 56b8c5b Author: Aris Feryanto aris_feryanto@yahoo.com Date: Tue Aug 23 15:00:51 2011 +0800
Merge remote-tracking branch 'origin/master' into aris
commit 2b4acfa534835b7e41eaeb583c761c4312fd8488 Merge: f82ad23 af5c63a Author: Aris Feryanto aris_feryanto@yahoo.com Date: Tue Aug 23 02:26:57 2011 +0800
Merge remote-tracking branch 'origin/master' into aris
commit f82ad2318cc90bcff6e3624af704a769738e3e99 Author: Aris Feryanto aris_feryanto@yahoo.com Date: Tue Aug 23 02:10:58 2011 +0800
Grid edit: fix bug - show NULL checkbox for normal grid-editable text
-----------------------------------------------------------------------
Summary of changes: js/makegrid.js | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/js/makegrid.js b/js/makegrid.js index e7f2d32..f559677 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -806,7 +806,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.find('select').live('change', function(e) { $(g.cEdit).find('.edit_box').val($(this).val()); }) - $editArea.show(); } else if($td.is('.enum')) { //handle enum fields @@ -835,7 +834,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.find('select').live('change', function(e) { $(g.cEdit).find('.edit_box').val($(this).val()); }) - $editArea.show(); } else if($td.is('.set')) { //handle set fields @@ -865,7 +863,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.find('select').live('change', function(e) { $(g.cEdit).find('.edit_box').val($(this).val()); }) - $editArea.show(); } else if($td.is('.truncated, .transformed')) { if ($td.is('.to_be_saved')) { // cell has been edited @@ -929,7 +926,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }) // end $.post() } g.isEditCellTextEditable = true; - $editArea.show(); } else if ($td.is('.datefield, .datetimefield, .timestampfield')) { var $input_field = $(g.cEdit).find('.edit_box');
@@ -962,9 +958,16 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } else { $input_field.val(''); } - $editArea.show(); + $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>'); } else { g.isEditCellTextEditable = true; + // only append edit area hint if there is a null checkbox + if ($editArea.children().length > 0) { + $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>'); + } + } + if ($editArea.children().length > 0) { + $editArea.show(); } } },
hooks/post-receive