Skip to content

Commit 643102d

Browse files
committed
New version 2.5.14
1 parent c681638 commit 643102d

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

build/jquery.datetimepicker.full.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,17 +1669,27 @@ var datetimepickerFactory = function ($) {
16691669
if(!options.allowDateRe.test(dateHelper.formatDate(start, options.formatDate))){
16701670
classes.push('xdsoft_disabled');
16711671
}
1672-
} else if(options.allowDates && options.allowDates.length>0){
1672+
}
1673+
1674+
if(options.allowDates && options.allowDates.length>0){
16731675
if(options.allowDates.indexOf(dateHelper.formatDate(start, options.formatDate)) === -1){
16741676
classes.push('xdsoft_disabled');
16751677
}
1676-
} else if ((maxDate !== false && start > maxDate) || (minDateTime !== false && start < minDateTime) || (minDate !== false && start < minDate) || (customDateSettings && customDateSettings[0] === false)) {
1678+
}
1679+
1680+
if ((maxDate !== false && start > maxDate) || (minDateTime !== false && start < minDateTime) || (minDate !== false && start < minDate) || (customDateSettings && customDateSettings[0] === false)) {
16771681
classes.push('xdsoft_disabled');
1678-
} else if (options.disabledDates.indexOf(dateHelper.formatDate(start, options.formatDate)) !== -1) {
1682+
}
1683+
1684+
if (options.disabledDates.indexOf(dateHelper.formatDate(start, options.formatDate)) !== -1) {
16791685
classes.push('xdsoft_disabled');
1680-
} else if (options.disabledWeekDays.indexOf(day) !== -1) {
1686+
}
1687+
1688+
if (options.disabledWeekDays.indexOf(day) !== -1) {
16811689
classes.push('xdsoft_disabled');
1682-
}else if (input.is('[disabled]')) {
1690+
}
1691+
1692+
if (input.is('[disabled]')) {
16831693
classes.push('xdsoft_disabled');
16841694
}
16851695

build/jquery.datetimepicker.full.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-datetimepicker",
3-
"version": "2.5.13",
3+
"version": "2.5.14",
44
"description": "jQuery Plugin DateTimePicker it is DatePicker and TimePicker in one",
55
"main": "build/jquery.datetimepicker.full.min.js",
66
"scripts": {

0 commit comments

Comments
 (0)