Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-19 18:41:15 +01:00
commit 006788069a
2 changed files with 1 additions and 8 deletions

View File

@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
4.3.8.0 (not yet released)
- bug Undefined constant PMA_DRIZZLE
- bug #4712 Wrongly positioned date-picker while Grid-Editing
4.3.7.0 (2015-01-15)
- bug #4694 js error on marking table as favorite in Safari (in private mode)

View File

@ -1017,14 +1017,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$input_field.datepicker("show");
//move ui-datepicker-div inside cEdit div
var datepicker_div = $('#ui-datepicker-div');
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();
}