Skip to content
This repository has been archived by the owner on May 31, 2021. It is now read-only.

FIX: Identify and display weekend in calendar properly #501

Closed
wants to merge 2 commits into from
Closed

FIX: Identify and display weekend in calendar properly #501

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a0e4af
FIX: Identify and display weekend in calendar properly
aetherwu Feb 7, 2018
b4e5383
ADD: allow date disable in range
aetherwu Feb 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 60 additions & 2 deletions src/js/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,8 @@
dayIndex = 0 + (p.params.firstDay - 1),
today = new Date().setHours(0,0,0,0),
minDate = p.params.minDate ? new Date(p.params.minDate).getTime() : null,
maxDate = p.params.maxDate ? new Date(p.params.maxDate).getTime() : null;
maxDate = p.params.maxDate ? new Date(p.params.maxDate).getTime() : null,
disabled;

if (p.value && p.value.length) {
for (i = 0; i < p.value.length; i++) {
Expand Down Expand Up @@ -348,13 +349,18 @@
// Selected
if (currentValues.indexOf(dayDate) >= 0) addClass += ' picker-calendar-day-selected';
// Weekend
if (p.params.weekendDays.indexOf(col - 1) >= 0) {
if (col>5) {
addClass += ' picker-calendar-day-weekend';
}
// Disabled
if ((minDate && dayDate < minDate) || (maxDate && dayDate > maxDate)) {
addClass += ' picker-calendar-day-disabled';
}
if (p.params.disabled) {
if (p.dateInRange(dayDate, p.params.disabled)) {
addClass += ' picker-calendar-day-disabled';
}
}

dayDate = new Date(dayDate);
var dayYear = dayDate.getFullYear();
Expand Down Expand Up @@ -584,6 +590,57 @@
p.prevYear = function () {
p.setYearMonth(p.currentYear - 1);
};

// Scan Dates Range
p.dateInRange = function (dayDate, range) {
var match = false;
var i;
if (!range) return false;
if ($.isArray(range)) {
for (i = 0; i < range.length; i ++) {
if (range[i].from || range[i].to) {
if (range[i].from && range[i].to) {
if ((dayDate <= new Date(range[i].to).getTime()) && (dayDate >= new Date(range[i].from).getTime())) {
match = true;
}
}
else if (range[i].from) {
if (dayDate >= new Date(range[i].from).getTime()) {
match = true;
}
}
else if (range[i].to) {
if (dayDate <= new Date(range[i].to).getTime()) {
match = true;
}
}
} else if (dayDate === new Date(range[i]).getTime()) {
match = true;
}
}
}
else if (range.from || range.to) {
if (range.from && range.to) {
if ((dayDate <= new Date(range.to).getTime()) && (dayDate >= new Date(range.from).getTime())) {
match = true;
}
}
else if (range.from) {
if (dayDate >= new Date(range.from).getTime()) {
match = true;
}
}
else if (range.to) {
if (dayDate <= new Date(range.to).getTime()) {
match = true;
}
}
}
else if (typeof range === 'function') {
match = range(new Date(dayDate));
}
return match;
};


// HTML Layout
Expand Down Expand Up @@ -852,6 +909,7 @@
direction: 'horizontal', // or 'vertical'
minDate: null,
maxDate: null,
disabled: null,
touchMove: true,
animate: true,
closeOnSelect: true,
Expand Down