From cea9aa968871715ad5e57bb43d4babda95fda2a6 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Fri, 6 Mar 2015 18:20:35 +0530 Subject: [PATCH] Revert c9c280e9921d and b39933c37b8c Signed-off-by: Atul Pratap Singh --- js/makegrid.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 0934841e8a..6ec43bf73f 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1026,11 +1026,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $input_field.datepicker("show"); - var datepicker_top = parseInt(document.getElementById("ui-datepicker-div").style.getPropertyValue("top"), 10); + //move ui-datepicker-div inside cEdit div + var datepicker_div = $('#ui-datepicker-div'); + datepicker_div.css({'top': 0, 'left': 0, 'position': 'relative'}); + $('.cEdit').append(datepicker_div); - if (datepicker_top > 370 && !is_null) { - document.getElementById("ui-datepicker-div").style.marginTop = "30px"; - } + var edit_area_top = $('#ui-datepicker-div').height()+32; + $('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'}); if (is_null){ $(g.cEdit).find('.edit_area').hide();