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

New version 2.5.13

Browse Source
This commit is contained in:
Chupurnov Valeriy 2017-11-21 18:06:16 +05:00
parent 63441fde6d
commit cb69c60093
3 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/jquery.datetimepicker.full.js
View File

@ -1017,10 +1017,15 @@ var datetimepickerFactory = function ($) {
.find('.xdsoft_select') .find('.xdsoft_select')
.xdsoftScroller(options) .xdsoftScroller(options)
.on('touchstart mousedown.xdsoft', function (event) { .on('touchstart mousedown.xdsoft', function (event) {
this.touchmoved = false;
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
}) })
.on('touchstart mousedown.xdsoft', '.xdsoft_option', function () { .on('touchmove', '.xdsoft_option', function () {
this.touchmoved = true;
})
.on('touchend mousedown.xdsoft', '.xdsoft_option', function () {
if (!this.touchmoved) {
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();
} }
@ -1040,6 +1045,7 @@ var datetimepickerFactory = function ($) {
if (year !== _xdsoft_datetime.currentTime.getFullYear() && $.isFunction(options.onChangeYear)) { if (year !== _xdsoft_datetime.currentTime.getFullYear() && $.isFunction(options.onChangeYear)) {
options.onChangeYear.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input')); options.onChangeYear.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input'));
} }
}
}); });
datetimepicker.getValue = function () { datetimepicker.getValue = function () {
@ -1876,7 +1882,14 @@ var datetimepickerFactory = function ($) {
}); });
timebox timebox
.on('touchstart', 'div', function (xdevent) {
this.touchmoved = false;
})
.on('touchmove', 'div', function (xdevent) {
this.touchmoved = true;
})
.on('touchend click.xdsoft', 'div', function (xdevent) { .on('touchend click.xdsoft', 'div', function (xdevent) {
if (!this.touchmoved) {
xdevent.stopPropagation(); xdevent.stopPropagation();
var $this = $(this), var $this = $(this),
currentTime = _xdsoft_datetime.currentTime; currentTime = _xdsoft_datetime.currentTime;
@ -1904,6 +1917,7 @@ var datetimepickerFactory = function ($) {
if (options.inline !== true && options.closeOnTimeSelect === true) { if (options.inline !== true && options.closeOnTimeSelect === true) {
datetimepicker.trigger('close.xdsoft'); datetimepicker.trigger('close.xdsoft');
} }
}
}); });
datepicker datepicker

2
build/jquery.datetimepicker.full.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "jquery-datetimepicker", "name": "jquery-datetimepicker",
"version": "2.5.12", "version": "2.5.13",
"description": "jQuery Plugin DateTimePicker it is DatePicker and TimePicker in one", "description": "jQuery Plugin DateTimePicker it is DatePicker and TimePicker in one",
"main": "build/jquery.datetimepicker.full.min.js", "main": "build/jquery.datetimepicker.full.min.js",
"scripts": { "scripts": {