From 7dae314aa3ef628ba492860787451de7207e5b9d Mon Sep 17 00:00:00 2001 From: Viduranga Wijesooriya Date: Mon, 24 Feb 2014 22:39:21 +0530 Subject: [PATCH 1/4] fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value Signed-off-by: Viduranga Wijesooriya --- js/makegrid.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 0f9c417aaf..b35c572c6e 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1708,8 +1708,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } }); $('html').click(function (e) { - // hide edit cell if the click is not from the datepicker - if ($(e.target).parents().index($('#ui-datepicker-div')) == -1) { + // hide edit cell if the click is not from the datepicker or edit area + if ($(e.target).parents().index($('#ui-datepicker-div') && $('.cEdit .edit_area')) == -1) { g.hideEditCell(); } }).keydown(function (e) { From 6c22b4d4b944c5b37e692f16b7a41cd5fdbfb8b8 Mon Sep 17 00:00:00 2001 From: Viduranga Wijesooriya Date: Tue, 25 Feb 2014 19:16:42 +0530 Subject: [PATCH 2/4] re fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value Signed-off-by: Viduranga Wijesooriya --- js/makegrid.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/makegrid.js b/js/makegrid.js index b35c572c6e..e8f5469547 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1709,7 +1709,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }); $('html').click(function (e) { // hide edit cell if the click is not from the datepicker or edit area - if ($(e.target).parents().index($('#ui-datepicker-div') && $('.cEdit .edit_area')) == -1) { + if ($(e.target).parents().index($('#ui-datepicker-div')) == -1 && + $(e.target).parents().index($('.cEdit .edit_area')) == -1){ g.hideEditCell(); } }).keydown(function (e) { From 07dd92c5be46c66bcf685cd68003a9270768fea8 Mon Sep 17 00:00:00 2001 From: Viduranga Wijesooriya Date: Tue, 25 Feb 2014 19:29:38 +0530 Subject: [PATCH 3/4] bug-#4281 reset the position of the edit_area div after closing datetime picker Signed-off-by: Viduranga Wijesooriya --- js/makegrid.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index e8f5469547..38582285d2 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -798,6 +798,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cEdit).find('.edit_box').val(''); }); } + + //reset the position of the edit_area div after closing datetime picker + $('.edit_area').css({'top' :'0','position':''}); if ($td.is('.relation')) { //handle relations @@ -1709,9 +1712,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }); $('html').click(function (e) { // hide edit cell if the click is not from the datepicker or edit area - if ($(e.target).parents().index($('#ui-datepicker-div')) == -1 && - $(e.target).parents().index($('.cEdit .edit_area')) == -1){ - g.hideEditCell(); + if (($(e.target).parents().index($('#ui-datepicker-div')) && + $(e.target).parents().index($('.cEdit .edit_area'))) == -1){ + g.hideEditCell(); } }).keydown(function (e) { if (e.which == 27 && g.isCellEditActive) { From 1c732b783bc2232b3e88ecb64bfca99ed25dbfbb Mon Sep 17 00:00:00 2001 From: Viduranga Wijesooriya Date: Tue, 25 Feb 2014 19:35:02 +0530 Subject: [PATCH 4/4] re fixed bug-#4281 Grid edit enum field, dialog disappears when trying to select value Signed-off-by: Viduranga Wijesooriya --- js/makegrid.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 38582285d2..a6169c11de 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -798,7 +798,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cEdit).find('.edit_box').val(''); }); } - + //reset the position of the edit_area div after closing datetime picker $('.edit_area').css({'top' :'0','position':''}); @@ -1712,8 +1712,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }); $('html').click(function (e) { // hide edit cell if the click is not from the datepicker or edit area - if (($(e.target).parents().index($('#ui-datepicker-div')) && - $(e.target).parents().index($('.cEdit .edit_area'))) == -1){ + if ($(e.target).parents().index($('#ui-datepicker-div')) == -1 && $(e.target).parents().index($('.cEdit .edit_area')) == -1){ g.hideEditCell(); } }).keydown(function (e) {