Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-12 19:57:07 +01:00
commit 9041ec8dd7

View File

@ -1036,10 +1036,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
//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);
$(g.cEdit).append(datepicker_div);
var edit_area_top = $('#ui-datepicker-div').height()+32;
$('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'});
$(g.cEdit).find('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'});
if (is_null){
$(g.cEdit).find('.edit_area').hide();