diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-03-09 12:18:43 +0300 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-03-09 12:18:43 +0300 |
| commit | 9bf5792dc0fab3132789f93393fe30ab73ebee91 (patch) | |
| tree | f4b94722726323322246ef8567109cb2ab5b611e /js/makegrid.js | |
| parent | a08353de46a431b1d5fcec34b1bf9b551a4766fa (diff) | |
| parent | 7dde05cc4188db5477eec0e872db047110856b1b (diff) | |
Merge branch 'QA_4_3' into QA_4_4
Diffstat (limited to 'js/makegrid.js')
| -rw-r--r-- | js/makegrid.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/js/makegrid.js b/js/makegrid.js index 80c65df6ec..7999b98789 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1033,11 +1033,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(); |