From e88f290d44c5842b1cbd3d9919ed179973779eaf Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Mon, 13 Jul 2015 01:59:24 +0000 Subject: [PATCH 1/2] Remove confusing second inline edit window (bug #4826) When a long truncated text field is being inline edited it pops up a second edit window which could be confusing. Removed it. Signed-off-by: Jack Smith --- js/makegrid.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 4ed8fa742e..c1046a41d1 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -979,21 +979,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi if (typeof data !== 'undefined' && data.success === true) { $td.data('original_data', data.value); $(g.cEdit).find('.edit_box').val(data.value); - $editArea.append(''); - $editArea.find('textarea').val(data.value); - $editArea - .on('keyup', 'textarea', function (e) { - $(g.cEdit).find('.edit_box').val($(this).val()); - }); - $(g.cEdit).on('keyup', '.edit_box', function (e) { - $editArea.find('textarea').val($(this).val()); - }); - $editArea.append('
' + g.cellEditHint + '
'); } else { PMA_ajaxShowMessage(data.error, false); } }); // end $.post() - $editArea.show(); } g.isEditCellTextEditable = true; } else if ($td.is('.timefield, .datefield, .datetimefield, .timestampfield')) { From 9bffc176fe966c3fff05381a1baa1ae5e03724d3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 13 Jul 2015 06:53:44 -0400 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 580f1f94ec..03de915020 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug Saved chart image does not have a proper name or an extension - bug #4976 Timepicker CSS issues in Original theme - bug #4975 Move/Copy/Rename operations on Table/Db fail on Drizzle server +- bug #4826 Two inline edit windows 4.4.11.0 (2015-07-06) - bug Missing selected/entered values when editing active options in visual query builder