gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-03-09 13:33:09 +05:30
commit 921710ec4d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/makegrid.js
View File

@ -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();