Merge commit '17d9d82'

Conflicts:
	js/makegrid.js

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
This commit is contained in:
Atul Pratap Singh 2015-03-13 23:24:01 +05:30
commit 0e1b596ca5

View File

@ -1038,9 +1038,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
datepicker_div.css({'top': 0, 'left': 0, 'position': 'relative'});
$(g.cEdit).append(datepicker_div);
var edit_area_top = $('#ui-datepicker-div').height()+32;
$(g.cEdit).find('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'});
if (is_null){
$(g.cEdit).find('.edit_area').hide();
}