mirror of
https://github.com/xdan/datetimepicker.git
synced 2024-11-18 06:24:22 +00:00
Fix behavior under iPad and iPhone
This commit is contained in:
parent
0a5e0ef094
commit
ee7047e204
@ -72,7 +72,8 @@ $('#default_datetimepicker').datetimepicker({
|
||||
formatTime:'H:i',
|
||||
formatDate:'d.m.Y',
|
||||
defaultDate:'8.12.1986', // it's my birthday
|
||||
defaultTime:'10:00'
|
||||
defaultTime:'10:00',
|
||||
timepickerScrollbar:false
|
||||
});
|
||||
|
||||
$('#datetimepicker10').datetimepicker({
|
||||
|
@ -348,7 +348,10 @@
|
||||
touchStart = false,
|
||||
startTopScroll = 0,
|
||||
calcOffset = function () {};
|
||||
|
||||
if (percent === 'hide') {
|
||||
timeboxparent.find('.xdsoft_scrollbar').hide();
|
||||
return;
|
||||
}
|
||||
if (!$(this).hasClass('xdsoft_scroller_box')) {
|
||||
timebox = timeboxparent.children().eq(0);
|
||||
parentHeight = timeboxparent[0].clientHeight;
|
||||
@ -532,8 +535,8 @@
|
||||
timepicker = $('<div class="xdsoft_timepicker active"><button type="button" class="xdsoft_prev"></button><div class="xdsoft_time_box"></div><button type="button" class="xdsoft_next"></button></div>'),
|
||||
timeboxparent = timepicker.find('.xdsoft_time_box').eq(0),
|
||||
timebox = $('<div class="xdsoft_time_variant"></div>'),
|
||||
scrollbar = $('<div class="xdsoft_scrollbar"></div>'),
|
||||
scroller = $('<div class="xdsoft_scroller"></div>'),
|
||||
/*scrollbar = $('<div class="xdsoft_scrollbar"></div>'),
|
||||
scroller = $('<div class="xdsoft_scroller"></div>'),*/
|
||||
monthselect = $('<div class="xdsoft_select xdsoft_monthselect"><div></div></div>'),
|
||||
yearselect = $('<div class="xdsoft_select xdsoft_yearselect"><div></div></div>'),
|
||||
triggerAfterOpen = false,
|
||||
@ -661,7 +664,7 @@
|
||||
}
|
||||
|
||||
if (!options.timepickerScrollbar) {
|
||||
scrollbar.hide();
|
||||
timeboxparent.xdsoftScroller('hide');
|
||||
}
|
||||
|
||||
if (options.minDate && /^-(.*)$/.test(options.minDate)) {
|
||||
|
Loading…
Reference in New Issue
Block a user