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

Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

Browse Source
This commit is contained in:
Weblate 2015-03-13 18:16:46 +01:00
commit f206cb35d8
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/functions.js
View File

@ -353,7 +353,15 @@ function PMA_addDatepicker($this_element, type, options)
// Remember that we came from the datepicker; this is used
// in tbl_change.js by verificationsAfterFieldChange()
$this_element.data('comes_from', 'datepicker');
if ($(input).closest('.cEdit').length > 0) {
setTimeout(function () {
inst.dpDiv.css({
top: 0,
left: 0,
position: 'relative'
});
}, 0);
}
// Fix wrong timepicker z-index, doesn't work without timeout
setTimeout(function () {
$('#ui-timepicker-div').css('z-index', $('#ui-datepicker-div').css('z-index'));

10
js/makegrid.js
View File

@ -697,6 +697,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
// destroy datepicker in edit area, if exist
var $dp = $(g.cEdit).find('.hasDatepicker');
if ($dp.length > 0) {
$(document).bind('mousedown', $.datepicker._checkExternalClick);
$dp.datepicker('destroy');
// change the cursor in edit box back to normal
// (the cursor become a hand pointer when we add datepicker)
@ -1032,14 +1033,15 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
});
$input_field.datepicker("show");
// unbind the mousedown event to prevent the problem of
// datepicker getting closed, needs to be checked for any
// change in names when updating
$(document).unbind('mousedown', $.datepicker._checkExternalClick);
//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);
var edit_area_top = $('#ui-datepicker-div').height()+32;
$('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'});
$(g.cEdit).append(datepicker_div);
if (is_null){
$(g.cEdit).find('.edit_area').hide();