library-mirrors/datetimepicker
1
0
Fork 0
mirror of https://github.com/xdan/datetimepicker.git synced 2024-11-18 06:24:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #336 from sspencertt/master

Browse Source 
Add touch support for iOS.
This commit is contained in:
Valeriy 2015-10-22 11:13:02 +05:00
commit 7e35e32536
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
jquery.datetimepicker.js
View File

@ -700,12 +700,12 @@
startTopScroll = parseInt(scroller.css('margin-top'), 10); startTopScroll = parseInt(scroller.css('margin-top'), 10);
h1 = scrollbar[0].offsetHeight; h1 = scrollbar[0].offsetHeight;
if (event.type === 'mousedown') { if (event.type === 'mousedown' || event.type === 'touchstart') {
if (document) { if (document) {
$(document.body).addClass('xdsoft_noselect'); $(document.body).addClass('xdsoft_noselect');
} }
$([document.body, window]).on('mouseup.xdsoft_scroller', function arguments_callee() { $([document.body, window]).on('touchend mouseup.xdsoft_scroller', function arguments_callee() {
$([document.body, window]).off('mouseup.xdsoft_scroller', arguments_callee) $([document.body, window]).off('touchend mouseup.xdsoft_scroller', arguments_callee)
.off('mousemove.xdsoft_scroller', calcOffset) .off('mousemove.xdsoft_scroller', calcOffset)
.removeClass('xdsoft_noselect'); .removeClass('xdsoft_noselect');
}); });
@ -823,7 +823,7 @@
lazyInit = function (input) { lazyInit = function (input) {
input input
.on('open.xdsoft focusin.xdsoft mousedown.xdsoft', function initOnActionCallback(event) { .on('open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart', function initOnActionCallback(event) {
if (input.is(':disabled') || input.data('xdsoft_datetimepicker')) { if (input.is(':disabled') || input.data('xdsoft_datetimepicker')) {
return; return;
} }
@ -834,7 +834,7 @@
createDateTimePicker(input); createDateTimePicker(input);
} }
input input
.off('open.xdsoft focusin.xdsoft mousedown.xdsoft', initOnActionCallback) .off('open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart', initOnActionCallback)
.trigger('open.xdsoft'); .trigger('open.xdsoft');
}, 100); }, 100);
}); });
@ -893,7 +893,7 @@
mounth_picker mounth_picker
.find('.xdsoft_month,.xdsoft_year') .find('.xdsoft_month,.xdsoft_year')
.on('mousedown.xdsoft', function (event) { .on('touchstart mousedown.xdsoft', function (event) {
var select = $(this).find('.xdsoft_select').eq(0), var select = $(this).find('.xdsoft_select').eq(0),
val = 0, val = 0,
top = 0, top = 0,
@ -925,12 +925,11 @@
mounth_picker mounth_picker
.find('.xdsoft_select') .find('.xdsoft_select')
.xdsoftScroller() .xdsoftScroller()
.on('mousedown.xdsoft', function (event) { .on('touchstart mousedown.xdsoft', function (event) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
}) })
.on('mousedown.xdsoft', '.xdsoft_option', function (event) { .on('touchstart mousedown.xdsoft', '.xdsoft_option', function (event) {
if (_xdsoft_datetime.currentTime === undefined || _xdsoft_datetime.currentTime === null) { if (_xdsoft_datetime.currentTime === undefined || _xdsoft_datetime.currentTime === null) {
_xdsoft_datetime.currentTime = _xdsoft_datetime.now(); _xdsoft_datetime.currentTime = _xdsoft_datetime.now();
} }
@ -1249,7 +1248,7 @@
datetimepicker datetimepicker
.data('options', options) .data('options', options)
.on('mousedown.xdsoft', function (event) { .on('touchstart mousedown.xdsoft', function (event) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
yearselect.hide(); yearselect.hide();
@ -1449,7 +1448,7 @@
_xdsoft_datetime = new XDSoft_datetime(); _xdsoft_datetime = new XDSoft_datetime();
applyButton.on('click', function (e) {//pathbrite applyButton.on('touchend click', function (e) {//pathbrite
e.preventDefault(); e.preventDefault();
datetimepicker.data('changed', true); datetimepicker.data('changed', true);
_xdsoft_datetime.setCurrentTime(getCurrentValue()); _xdsoft_datetime.setCurrentTime(getCurrentValue());
@ -1458,7 +1457,7 @@
}); });
mounth_picker mounth_picker
.find('.xdsoft_today_button') .find('.xdsoft_today_button')
.on('mousedown.xdsoft', function () { .on('touchend mousedown.xdsoft', function () {
datetimepicker.data('changed', true); datetimepicker.data('changed', true);
_xdsoft_datetime.setCurrentTime(0); _xdsoft_datetime.setCurrentTime(0);
datetimepicker.trigger('afterOpen.xdsoft'); datetimepicker.trigger('afterOpen.xdsoft');
@ -1481,7 +1480,7 @@
}); });
mounth_picker mounth_picker
.find('.xdsoft_prev,.xdsoft_next') .find('.xdsoft_prev,.xdsoft_next')
.on('mousedown.xdsoft', function () { .on('touchend mousedown.xdsoft', function () {
var $this = $(this), var $this = $(this),
timer = 0, timer = 0,
stop = false; stop = false;
@ -1499,16 +1498,16 @@
} }
}(500)); }(500));
$([document.body, window]).on('mouseup.xdsoft', function arguments_callee2() { $([document.body, window]).on('touchend mouseup.xdsoft', function arguments_callee2() {
clearTimeout(timer); clearTimeout(timer);
stop = true; stop = true;
$([document.body, window]).off('mouseup.xdsoft', arguments_callee2); $([document.body, window]).off('touchend mouseup.xdsoft', arguments_callee2);
}); });
}); });
timepicker timepicker
.find('.xdsoft_prev,.xdsoft_next') .find('.xdsoft_prev,.xdsoft_next')
.on('mousedown.xdsoft', function () { .on('touchend mousedown.xdsoft', function () {
var $this = $(this), var $this = $(this),
timer = 0, timer = 0,
stop = false, stop = false,
@ -1528,11 +1527,11 @@
timer = setTimeout(arguments_callee4, v || period); timer = setTimeout(arguments_callee4, v || period);
} }
}(500)); }(500));
$([document.body, window]).on('mouseup.xdsoft', function arguments_callee5() { $([document.body, window]).on('touchend mouseup.xdsoft', function arguments_callee5() {
clearTimeout(timer); clearTimeout(timer);
stop = true; stop = true;
$([document.body, window]) $([document.body, window])
.off('mouseup.xdsoft', arguments_callee5); .off('touchend mouseup.xdsoft', arguments_callee5);
}); });
}); });
@ -1781,7 +1780,7 @@
timerclick = 0; timerclick = 0;
calendar calendar
.on('click.xdsoft', 'td', function (xdevent) { .on('touchend click.xdsoft', 'td', function (xdevent) {
xdevent.stopPropagation(); // Prevents closing of Pop-ups, Modals and Flyouts in Bootstrap xdevent.stopPropagation(); // Prevents closing of Pop-ups, Modals and Flyouts in Bootstrap
timerclick += 1; timerclick += 1;
var $this = $(this), var $this = $(this),
@ -1821,7 +1820,7 @@
}); });
timebox timebox
.on('click.xdsoft', 'div', function (xdevent) { .on('touchend click.xdsoft', 'div', function (xdevent) {
xdevent.stopPropagation(); xdevent.stopPropagation();
var $this = $(this), var $this = $(this),
currentTime = _xdsoft_datetime.currentTime; currentTime = _xdsoft_datetime.currentTime;
@ -1962,9 +1961,9 @@
.on('resize.xdsoft', setPos); .on('resize.xdsoft', setPos);
if (options.closeOnWithoutClick) { if (options.closeOnWithoutClick) {
$([document.body, window]).on('mousedown.xdsoft', function arguments_callee6() { $([document.body, window]).on('touchstart mousedown.xdsoft', function arguments_callee6() {
datetimepicker.trigger('close.xdsoft'); datetimepicker.trigger('close.xdsoft');
$([document.body, window]).off('mousedown.xdsoft', arguments_callee6); $([document.body, window]).off('touchstart mousedown.xdsoft', arguments_callee6);
}); });
} }
} }
@ -2030,7 +2029,7 @@
input input
.data('xdsoft_datetimepicker', datetimepicker) .data('xdsoft_datetimepicker', datetimepicker)
.on('open.xdsoft focusin.xdsoft mousedown.xdsoft', function (event) { .on('open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart', function (event) {
if (input.is(':disabled') || (input.data('xdsoft_datetimepicker').is(':visible') && options.closeOnInputClick)) { if (input.is(':disabled') || (input.data('xdsoft_datetimepicker').is(':visible') && options.closeOnInputClick)) {
return; return;
} }
@ -2070,7 +2069,7 @@
.data('xdsoft_datetimepicker', null) .data('xdsoft_datetimepicker', null)
.off('.xdsoft'); .off('.xdsoft');
$(window).off('resize.xdsoft'); $(window).off('resize.xdsoft');
$([window, document.body]).off('mousedown.xdsoft'); $([window, document.body]).off('mousedown.xdsoft touchstart');
if (input.unmousewheel) { if (input.unmousewheel) {
input.unmousewheel(); input.unmousewheel();
} }