From e1c8056d87d33c47c487551e10eedaf124a2418d Mon Sep 17 00:00:00 2001 From: Christopher Lassen Date: Mon, 12 Oct 2020 11:29:46 +0200 Subject: [PATCH] Fixed isFunction deprecation --- jquery.datetimepicker.js | 50 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/jquery.datetimepicker.js b/jquery.datetimepicker.js index 7afaac2..20b0036 100644 --- a/jquery.datetimepicker.js +++ b/jquery.datetimepicker.js @@ -1122,11 +1122,11 @@ var datetimepickerFactory = function ($) { $(this).parent().parent().hide(); datetimepicker.trigger('xchange.xdsoft'); - if (options.onChangeMonth && $.isFunction(options.onChangeMonth)) { + if (options.onChangeMonth && typeof options.onChangeMonth === 'function') { options.onChangeMonth.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input')); } - if (year !== _xdsoft_datetime.currentTime.getFullYear() && $.isFunction(options.onChangeYear)) { + if (year !== _xdsoft_datetime.currentTime.getFullYear() && typeof options.onChangeYear === 'function') { options.onChangeYear.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input')); } } @@ -1141,15 +1141,15 @@ var datetimepickerFactory = function ($) { options = $.extend(true, {}, options, _options); - if (_options.allowTimes && Array.isArray(_options.allowTimes) && _options.allowTimes.length) { + if (_options.allowTimes && $.isArray(_options.allowTimes) && _options.allowTimes.length) { options.allowTimes = $.extend(true, [], _options.allowTimes); } - if (_options.weekends && Array.isArray(_options.weekends) && _options.weekends.length) { + if (_options.weekends && $.isArray(_options.weekends) && _options.weekends.length) { options.weekends = $.extend(true, [], _options.weekends); } - if (_options.allowDates && Array.isArray(_options.allowDates) && _options.allowDates.length) { + if (_options.allowDates && $.isArray(_options.allowDates) && _options.allowDates.length) { options.allowDates = $.extend(true, [], _options.allowDates); } @@ -1157,7 +1157,7 @@ var datetimepickerFactory = function ($) { options.allowDateRe = new RegExp(_options.allowDateRe); } - if (_options.highlightedDates && Array.isArray(_options.highlightedDates) && _options.highlightedDates.length) { + if (_options.highlightedDates && $.isArray(_options.highlightedDates) && _options.highlightedDates.length) { $.each(_options.highlightedDates, function (index, value) { var splitData = $.map(value.split(','), $.trim), exDesc, @@ -1176,7 +1176,7 @@ var datetimepickerFactory = function ($) { options.highlightedDates = $.extend(true, [], highlightedDates); } - if (_options.highlightedPeriods && Array.isArray(_options.highlightedPeriods) && _options.highlightedPeriods.length) { + if (_options.highlightedPeriods && $.isArray(_options.highlightedPeriods) && _options.highlightedPeriods.length) { highlightedDates = $.extend(true, [], options.highlightedDates); $.each(_options.highlightedPeriods, function (index, value) { var dateTest, // start date @@ -1186,7 +1186,7 @@ var datetimepickerFactory = function ($) { keyDate, exDesc, style; - if (Array.isArray(value)) { + if ($.isArray(value)) { dateTest = value[0]; dateEnd = value[1]; desc = value[2]; @@ -1218,11 +1218,11 @@ var datetimepickerFactory = function ($) { options.highlightedDates = $.extend(true, [], highlightedDates); } - if (_options.disabledDates && Array.isArray(_options.disabledDates) && _options.disabledDates.length) { + if (_options.disabledDates && $.isArray(_options.disabledDates) && _options.disabledDates.length) { options.disabledDates = $.extend(true, [], _options.disabledDates); } - if (_options.disabledWeekDays && Array.isArray(_options.disabledWeekDays) && _options.disabledWeekDays.length) { + if (_options.disabledWeekDays && $.isArray(_options.disabledWeekDays) && _options.disabledWeekDays.length) { options.disabledWeekDays = $.extend(true, [], _options.disabledWeekDays); } @@ -1460,11 +1460,11 @@ var datetimepickerFactory = function ($) { ); _this.currentTime.setMonth(month); - if (options.onChangeMonth && $.isFunction(options.onChangeMonth)) { + if (options.onChangeMonth && typeof options.onChangeMonth === 'function') { options.onChangeMonth.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input')); } - if (year !== _this.currentTime.getFullYear() && $.isFunction(options.onChangeYear)) { + if (year !== _this.currentTime.getFullYear() && typeof options.onChangeYear === 'function') { options.onChangeYear.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input')); } @@ -1490,7 +1490,7 @@ var datetimepickerFactory = function ($) { ) ); _this.currentTime.setMonth(month); - if (options.onChangeMonth && $.isFunction(options.onChangeMonth)) { + if (options.onChangeMonth && typeof options.onChangeMonth === 'function') { options.onChangeMonth.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input')); } datetimepicker.trigger('xchange.xdsoft'); @@ -1498,7 +1498,7 @@ var datetimepickerFactory = function ($) { }; _this.getWeekOfYear = function (datetime) { - if (options.onGetWeekOfYear && $.isFunction(options.onGetWeekOfYear)) { + if (options.onGetWeekOfYear && typeof options.onGetWeekOfYear === 'function') { var week = options.onGetWeekOfYear.call(datetimepicker, datetime); if (typeof week !== 'undefined') { return week; @@ -1777,7 +1777,7 @@ var datetimepickerFactory = function ($) { classes.push('xdsoft_date'); - if (options.beforeShowDay && $.isFunction(options.beforeShowDay.call)) { + if (options.beforeShowDay && typeof options.beforeShowDay.call === 'function') { customDateSettings = options.beforeShowDay.call(datetimepicker, start); } else { customDateSettings = null; @@ -1838,7 +1838,7 @@ var datetimepickerFactory = function ($) { description = hDate.desc === undefined ? '' : hDate.desc; } - if (options.beforeShowDay && $.isFunction(options.beforeShowDay)) { + if (options.beforeShowDay && typeof options.beforeShowDay === 'function') { classes.push(options.beforeShowDay(start)); } @@ -1904,7 +1904,7 @@ var datetimepickerFactory = function ($) { line_time = function line_time(h, m) { var now = _xdsoft_datetime.now(), current_time, - isALlowTimesInit = options.allowTimes && Array.isArray(options.allowTimes) && options.allowTimes.length; + isALlowTimesInit = options.allowTimes && $.isArray(options.allowTimes) && options.allowTimes.length; now.setHours(h); h = parseInt(now.getHours(), 10); now.setMinutes(m); @@ -1935,7 +1935,7 @@ var datetimepickerFactory = function ($) { time += '
' + dateHelper.formatDate(now, options.formatTime) + '
'; }; - if (!options.allowTimes || !Array.isArray(options.allowTimes) || !options.allowTimes.length) { + if (!options.allowTimes || !$.isArray(options.allowTimes) || !options.allowTimes.length) { for (i = 0, j = 0; i < (options.hours12 ? 12 : 24); i += 1) { for (j = 0; j < 60; j += options.step) { var currentMinutesOfDay = i * 60 + j; @@ -2021,7 +2021,7 @@ var datetimepickerFactory = function ($) { input.val(_xdsoft_datetime.str()); - if (options.onSelectDate && $.isFunction(options.onSelectDate)) { + if (options.onSelectDate && typeof options.onSelectDate === 'function') { options.onSelectDate.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input'), xdevent); } @@ -2061,7 +2061,7 @@ var datetimepickerFactory = function ($) { datetimepicker.data('input').val(_xdsoft_datetime.str()); - if (options.onSelectTime && $.isFunction(options.onSelectTime)) { + if (options.onSelectTime && typeof options.onSelectTime === 'function') { options.onSelectTime.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input'), xdevent); } datetimepicker.data('changed', true); @@ -2113,7 +2113,7 @@ var datetimepickerFactory = function ($) { datetimepicker .on('changedatetime.xdsoft', function (event) { - if (options.onChangeDateTime && $.isFunction(options.onChangeDateTime)) { + if (options.onChangeDateTime && typeof options.onChangeDateTime === 'function') { var $input = datetimepicker.data('input'); options.onChangeDateTime.call(datetimepicker, _xdsoft_datetime.currentTime, $input, event); delete options.value; @@ -2121,7 +2121,7 @@ var datetimepickerFactory = function ($) { } }) .on('generate.xdsoft', function () { - if (options.onGenerate && $.isFunction(options.onGenerate)) { + if (options.onGenerate && typeof options.onGenerate === 'function') { options.onGenerate.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input')); } if (triggerAfterOpen) { @@ -2271,7 +2271,7 @@ var datetimepickerFactory = function ($) { datetimepicker .on('open.xdsoft', function (event) { var onShow = true; - if (options.onShow && $.isFunction(options.onShow)) { + if (options.onShow && typeof options.onShow === 'function') { onShow = options.onShow.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input'), event); } if (onShow !== false) { @@ -2295,7 +2295,7 @@ var datetimepickerFactory = function ($) { .find('.xdsoft_month,.xdsoft_year') .find('.xdsoft_select') .hide(); - if (options.onClose && $.isFunction(options.onClose)) { + if (options.onClose && typeof options.onClose === 'function') { onClose = options.onClose.call(datetimepicker, _xdsoft_datetime.currentTime, datetimepicker.data('input'), event); } if (onClose !== false && !options.opened && !options.inline) { @@ -2671,7 +2671,7 @@ var datetimepickerFactory = function ($) { $input.trigger('blur.xdsoft'); break; default: - if (datetimepicker[opt] && $.isFunction(datetimepicker[opt])) { + if (datetimepicker[opt] && typeof datetimepicker[opt] === 'function') { result = datetimepicker[opt](opt2); } }