Merge remote-tracking branch 'origin/master'

phpmyadmin · Jan 19, 2015 · 0067880 · 0067880
2 parents ba202fb + 3e16842
commit 0067880
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -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)

diff --git a/js/makegrid.js b/js/makegrid.js
@@ -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();
                     }