Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(calendar): add eventDates support and onSelect handler #677

Merged
merged 4 commits into from
Apr 27, 2019
Merged

feat(calendar): add eventDates support and onSelect handler #677

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3dc602
feat(calendar): eventDates support
lubber-de Apr 17, 2019
d0e4a4e
feat(calendar): make use of metadata
lubber-de Apr 17, 2019
3986618
feat(calendar): added onSelect callback when a cell is selected
lubber-de Apr 18, 2019
5c46813
feat(calendar): select callback only on a date related cell
lubber-de Apr 18, 2019
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
50 changes: 36 additions & 14 deletions src/definitions/modules/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,20 @@ $.fn.calendar = function(parameters) {
var adjacent = isDay && cellDate.getMonth() !== ((month + 12) % 12);
var disabled = (!settings.selectAdjacentDays && adjacent) || !module.helper.isDateInRange(cellDate, mode) || settings.isDisabled(cellDate, mode) || module.helper.isDisabled(cellDate, mode) || !module.helper.isEnabled(cellDate, mode);
if (disabled) {
var disabledReason = module.helper.disabledReason(cellDate, mode);
if (disabledReason !== null) {
cell.attr("data-tooltip", disabledReason[metadata.message]);
var disabledDate = module.helper.findDayAsObject(cellDate, mode, settings.disabledDates);
if (disabledDate !== null && disabledDate[metadata.message]) {
cell.attr("data-tooltip", disabledDate[metadata.message]);
cell.attr("data-position", tooltipPosition);
}
} else {
var eventDate = module.helper.findDayAsObject(cellDate, mode, settings.eventDates);
if (eventDate !== null) {
cell.addClass(eventDate[metadata.class] || settings.eventClass);
if (eventDate[metadata.message]) {
cell.attr("data-tooltip", eventDate[metadata.message]);
cell.attr("data-position", tooltipPosition);
}
}
}
var active = module.helper.dateEqual(cellDate, date, mode);
var isToday = module.helper.dateEqual(cellDate, today, mode);
Expand Down Expand Up @@ -483,7 +492,7 @@ $.fn.calendar = function(parameters) {
var date = target.data(metadata.date);
var focusDate = target.data(metadata.focusDate);
var mode = target.data(metadata.mode);
if (date) {
if (date && settings.onSelect.call(element, date, module.get.mode()) !== false) {
var forceSet = target.hasClass(className.today);
module.selectDate(date, forceSet);
}
Expand Down Expand Up @@ -842,14 +851,19 @@ $.fn.calendar = function(parameters) {
return true;
}
},
disabledReason: function(date, mode) {
findDayAsObject: function(date, mode, dates) {
if (mode === 'day') {
for (var i = 0; i < settings.disabledDates.length; i++) {
var d = settings.disabledDates[i];
if (d !== null && typeof d === 'object' && module.helper.dateEqual(date, d[metadata.date], mode)) {
var reason = {};
reason[metadata.message] = d[metadata.message];
return reason;
var i = 0, il = dates.length;
var d;
for (; i < il; i++) {
d = dates[i];
if (d instanceof Date && module.helper.dateEqual(date, d, mode)) {
var dateObject = {};
dateObject[metadata.date] = d;
return dateObject;
}
else if (d !== null && typeof d === 'object' && d[metadata.date] && module.helper.dateEqual(date, d[metadata.date], mode) ) {
return d;
}
}
}
Expand All @@ -862,7 +876,7 @@ $.fn.calendar = function(parameters) {
if (!(date instanceof Date)) {
date = parser.date('' + date, settings);
}
if (isNaN(date.getTime())) {
if (!date || date === null || isNaN(date.getTime())) {
return undefined;
}
return date;
Expand Down Expand Up @@ -1143,6 +1157,7 @@ $.fn.calendar.settings = {
disabledDates : [], // specific day(s) which won't be selectable and contain additional information.
disabledDaysOfWeek : [], // day(s) which won't be selectable(s) (0 = Sunday)
enabledDates : [], // specific day(s) which will be selectable, all other days will be disabled
eventDates : [], // specific day(s) which will be shown in a different color and using tooltips
centuryBreak : 60, // starting short year until 99 where it will be assumed to belong to the last century
currentCentury : 2000, // century to be added to 2-digit years (00 to {centuryBreak}-1)
selectAdjacentDays : false, // The calendar can show dates from adjacent month. These adjacent month dates can also be made selectable.
Expand Down Expand Up @@ -1460,6 +1475,10 @@ $.fn.calendar.settings = {
onHidden: function () {
},

// callback before item is selected, return false to prevent selection
onSelect: function (date, mode) {
},

// is the given date disabled?
isDisabled: function (date, mode) {
return false;
Expand Down Expand Up @@ -1513,8 +1532,11 @@ $.fn.calendar.settings = {
maxDate: 'maxDate',
mode: 'mode',
monthOffset: 'monthOffset',
message: 'message'
}
message: 'message',
class: 'class'
},

eventClass: 'blue'
};

})(jQuery, window, document);