From f0b060ff9b2b8ad8d19cc84fa37112f0e4277ba1 Mon Sep 17 00:00:00 2001
From: Sotis <geo.sotis@gmail.com>
Date: Sun, 8 Mar 2020 20:43:08 +0200
Subject: [PATCH] rollback formatting on template and some linting

---
 .eslintrc.json  |   4 +-
 bower.json      |   1 +
 clndr.min.js    |   4 +-
 demo/demo.js    |   4 +-
 demo/index.html |   6 +-
 package.json    |   1 +
 src/clndr.js    | 563 ++++++++++++++++++++++++------------------------
 7 files changed, 291 insertions(+), 292 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 30abc2d..85ba993 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -8,7 +8,9 @@
     "$": true,
     "_": true,
     "define": true,
-    "moment": true
+    "moment": true,
+    "dayjs": true,
+    "weekday": true
   },
   "extends": ["standard"],
   "plugins": [],
diff --git a/bower.json b/bower.json
index bf7ab72..2541713 100644
--- a/bower.json
+++ b/bower.json
@@ -16,6 +16,7 @@
     "tests"
   ],
   "dependencies": {
+    "dayjs": "^1.8.22",
     "jquery": ">=1.9",
     "moment": ">=2.8.3"
   },
diff --git a/clndr.min.js b/clndr.min.js
index f0e1293..996d07a 100644
--- a/clndr.min.js
+++ b/clndr.min.js
@@ -1,3 +1,3 @@
-/*! clndr.min.js v1.5.1 2019-11-27 */
+/*! clndr.min.js v1.5.1 2020-03-08 */
 
-!function(t){"function"==typeof define&&define.amd?define(["jquery","moment"],t):"object"==typeof exports?t(require("jquery"),require("moment")):t(jQuery,moment)}(function(p,u){var a={events:[],ready:null,extras:null,render:null,moment:null,weekOffset:0,constraints:null,forceSixRows:null,selectedDate:null,doneRendering:null,daysOfTheWeek:null,multiDayEvents:null,startWithMonth:null,dateParameter:"date",template:"<div class='clndr-controls'><div class='clndr-control-button'><span class='clndr-previous-button'>previous</span></div><div class='month'><%= month %> <%= year %></div><div class='clndr-control-button rightalign'><span class='clndr-next-button'>next</span></div></div><table class='clndr-table' border='0' cellspacing='0' cellpadding='0'><thead><tr class='header-days'><% for(var i = 0; i < daysOfTheWeek.length; i++) { %><td class='header-day'><%= daysOfTheWeek[i] %></td><% } %></tr></thead><tbody><% for(var i = 0; i < numberOfRows; i++){ %><tr><% for(var j = 0; j < 7; j++){ %><% var d = j + i * 7; %><td class='<%= days[d].classes %>'><div class='day-contents'><%= days[d].day %></div></td><% } %></tr><% } %></tbody></table>",showAdjacentMonths:!0,trackSelectedDate:!1,formatWeekdayHeader:null,adjacentDaysChangeMonth:!1,ignoreInactiveDaysInSelection:null,lengthOfTime:{days:null,interval:1,months:null},clickEvents:{click:null,today:null,nextYear:null,nextMonth:null,nextInterval:null,previousYear:null,onYearChange:null,previousMonth:null,onMonthChange:null,previousInterval:null,onIntervalChange:null},targets:{day:"day",empty:"empty",nextButton:"clndr-next-button",todayButton:"clndr-today-button",previousButton:"clndr-previous-button",nextYearButton:"clndr-next-year-button",previousYearButton:"clndr-previous-year-button"},classes:{past:"past",today:"today",event:"event",inactive:"inactive",selected:"selected",lastMonth:"last-month",nextMonth:"next-month",adjacentMonth:"adjacent-month"}};function n(t,e){var n,s;this.element=t,this.options=p.extend(!0,{},a,e),this.options.moment&&(u=this.options.moment),this.validateOptions(),this.constraints={next:!0,today:!0,previous:!0,nextYear:!0,previousYear:!0},this.options.events.length&&(this.options.multiDayEvents?this.options.events=this.addMultiDayMomentObjectsToEvents(this.options.events):this.options.events=this.addMomentObjectToEvents(this.options.events)),this.options.lengthOfTime.months||this.options.lengthOfTime.days?this.options.lengthOfTime.months?(this.options.lengthOfTime.days=null,this.options.lengthOfTime.startDate?this.intervalStart=u(this.options.lengthOfTime.startDate).startOf("month"):this.options.startWithMonth?this.intervalStart=u(this.options.startWithMonth).startOf("month"):this.intervalStart=u().startOf("month"),this.intervalEnd=u(this.intervalStart).add(this.options.lengthOfTime.months,"months").subtract(1,"days"),this.month=this.intervalStart.clone()):this.options.lengthOfTime.days&&(this.options.lengthOfTime.startDate?this.intervalStart=u(this.options.lengthOfTime.startDate).startOf("day"):this.intervalStart=u().weekday(this.options.weekOffset).startOf("day"),this.intervalEnd=u(this.intervalStart).add(this.options.lengthOfTime.days-1,"days").endOf("day"),this.month=this.intervalStart.clone()):(this.month=u().startOf("month"),this.intervalStart=u(this.month),this.intervalEnd=u(this.month).endOf("month")),this.options.startWithMonth&&(this.month=u(this.options.startWithMonth).startOf("month"),this.intervalStart=u(this.month),this.intervalEnd=this.options.lengthOfTime.days?u(this.month).add(this.options.lengthOfTime.days-1,"days").endOf("day"):u(this.month).endOf("month")),this.options.constraints&&(this.options.constraints.startDate&&(s=u(this.options.constraints.startDate),this.options.lengthOfTime.days?(this.intervalStart.isBefore(s,"week")&&(this.intervalStart=s.startOf("week")),(this.intervalStart.diff(this.intervalEnd,"days")<this.options.lengthOfTime.days||this.intervalEnd.isBefore(this.intervalStart))&&(this.intervalEnd=u(this.intervalStart).add(this.options.lengthOfTime.days-1,"days").endOf("day"),this.month=this.intervalStart.clone())):(this.intervalStart.isBefore(s,"month")&&(this.intervalStart.set("month",s.month()).set("year",s.year()),this.month.set("month",s.month()).set("year",s.year())),this.intervalEnd.isBefore(s,"month")&&this.intervalEnd.set("month",s.month()).set("year",s.year()))),this.options.constraints.endDate&&(n=u(this.options.constraints.endDate),this.options.lengthOfTime.days?this.intervalStart.isAfter(n,"week")&&(this.intervalStart=u(n).endOf("week").subtract(this.options.lengthOfTime.days-1,"days").startOf("day"),this.intervalEnd=u(n).endOf("week"),this.month=this.intervalStart.clone()):(this.intervalEnd.isAfter(n,"month")&&(this.intervalEnd.set("month",n.month()).set("year",n.year()),this.month.set("month",n.month()).set("year",n.year())),this.intervalStart.isAfter(n,"month")&&this.intervalStart.set("month",n.month()).set("year",n.year())))),this._defaults=a,this._name="clndr",this.init()}n.prototype.init=function(){var t,e;if(this.daysOfTheWeek=this.options.daysOfTheWeek||[],e=this.options.formatWeekdayHeader||e,!this.options.daysOfTheWeek)for(this.daysOfTheWeek=[],e=this.options.formatWeekdayHeader||function(t){return t.format("dd").charAt(0)},t=0;t<7;t++)this.daysOfTheWeek.push(e(u().weekday(t)));if(this.options.weekOffset&&(this.daysOfTheWeek=this.shiftWeekdayLabels(this.options.weekOffset)),!p.isFunction(this.options.render)){if(this.options.render=null,"undefined"==typeof _)throw new Error("Underscore was not found. Please include underscore.js OR provide a custom render function.");this.compiledClndrTemplate=_.template(this.options.template)}p(this.element).html("<div class='clndr'></div>"),this.calendarContainer=p(".clndr",this.element),this.bindEvents(),this.render(),this.options.ready&&this.options.ready.apply(this,[])},n.prototype.validateOptions=function(){(6<this.options.weekOffset||this.options.weekOffset<0)&&(console.warn("clndr.js: An invalid offset "+this.options.weekOffset+" was provided (must be 0 - 6); using 0 instead."),this.options.weekOffset=0)},n.prototype.shiftWeekdayLabels=function(t){var e,n=this.daysOfTheWeek;for(e=0;e<t;e++)n.push(n.shift());return n},n.prototype.createDaysObject=function(e,n){var t,s,a,i,o,r,h,l,d=[],c=e.clone();n.diff(e,"days");if(this._currentIntervalStart=e.clone(),this.eventsLastMonth=[],this.eventsNextMonth=[],this.eventsThisInterval=[],this.options.events.length&&(this.eventsThisInterval=p(this.options.events).filter(function(){var t=this._clndrStartDateObject.isAfter(n);return!this._clndrEndDateObject.isBefore(e)&&!t}).toArray(),this.options.showAdjacentMonths&&(l=e.clone().subtract(1,"months").startOf("month"),r=l.clone().endOf("month"),h=n.clone().add(1,"months").startOf("month"),o=h.clone().endOf("month"),this.eventsLastMonth=p(this.options.events).filter(function(){var t=this._clndrEndDateObject.isBefore(l),e=this._clndrStartDateObject.isAfter(r);return!(t||e)}).toArray(),this.eventsNextMonth=p(this.options.events).filter(function(){var t=this._clndrEndDateObject.isBefore(h),e=this._clndrStartDateObject.isAfter(o);return!(t||e)}).toArray())),!this.options.lengthOfTime.days)if((a=c.weekday()-this.options.weekOffset)<0&&(a+=7),this.options.showAdjacentMonths)for(t=1;t<=a;t++)s=u([e.year(),e.month(),t]).subtract(a,"days"),d.push(this.createDayObject(s,this.eventsLastMonth));else for(t=0;t<a;t++)d.push(this.calendarDay({classes:this.options.targets.empty+" "+this.options.classes.lastMonth}));for(i=e.clone();i.isBefore(n)||i.isSame(n,"day");)d.push(this.createDayObject(i.clone(),this.eventsThisInterval)),i.add(1,"days");if(!this.options.lengthOfTime.days)for(;d.length%7!=0;)this.options.showAdjacentMonths?d.push(this.createDayObject(i.clone(),this.eventsNextMonth)):d.push(this.calendarDay({classes:this.options.targets.empty+" "+this.options.classes.nextMonth})),i.add(1,"days");if(this.options.forceSixRows&&42!==d.length)for(;d.length<42;)this.options.showAdjacentMonths?(d.push(this.createDayObject(i.clone(),this.eventsNextMonth)),i.add(1,"days")):d.push(this.calendarDay({classes:this.options.targets.empty+" "+this.options.classes.nextMonth}));return d},n.prototype.createDayObject=function(t,e){var n,s,a,i,o,r,h=0,l=u(),d=[],c="",p={isToday:!1,isInactive:!1,isAdjacentMonth:!1};for(!t.isValid()&&t.hasOwnProperty("_d")&&void 0!==t._d&&(t=u(t._d)),a=t.clone().endOf("day");h<e.length;h++)s=e[h]._clndrStartDateObject,n=e[h]._clndrEndDateObject,s<=a&&t<=n&&d.push(e[h]);return l.format("YYYY-MM-DD")===t.format("YYYY-MM-DD")&&(c+=" "+this.options.classes.today,p.isToday=!0),t.isBefore(l,"day")&&(c+=" "+this.options.classes.past),d.length&&(c+=" "+this.options.classes.event),this.options.lengthOfTime.days||(this._currentIntervalStart.month()>t.month()?(c+=" "+this.options.classes.adjacentMonth,p.isAdjacentMonth=!0,this._currentIntervalStart.year()===t.year()?c+=" "+this.options.classes.lastMonth:c+=" "+this.options.classes.nextMonth):this._currentIntervalStart.month()<t.month()&&(c+=" "+this.options.classes.adjacentMonth,p.isAdjacentMonth=!0,this._currentIntervalStart.year()===t.year()?c+=" "+this.options.classes.nextMonth:c+=" "+this.options.classes.lastMonth)),this.options.constraints&&(i=u(this.options.constraints.endDate),o=u(this.options.constraints.startDate),this.options.constraints.startDate&&t.isBefore(o)&&(c+=" "+this.options.classes.inactive,p.isInactive=!0),this.options.constraints.endDate&&t.isAfter(i)&&(c+=" "+this.options.classes.inactive,p.isInactive=!0)),!t.isValid()&&t.hasOwnProperty("_d")&&void 0!==t._d&&(t=u(t._d)),r=u(this.options.selectedDate),this.options.selectedDate&&t.isSame(r,"day")&&(c+=" "+this.options.classes.selected),c+=" calendar-day-"+t.format("YYYY-MM-DD"),c+=" calendar-dow-"+t.weekday(),this.calendarDay({date:t,day:t.date(),events:d,properties:p,classes:this.options.targets.day+c})},n.prototype.render=function(){var t,e,n,s,a,i,o,r,h={},l=null,d=null,c=this.intervalEnd.clone().add(1,"years"),p=this.intervalStart.clone().subtract(1,"years");if(this.calendarContainer.empty(),this.options.lengthOfTime.days)h={days:e=this.createDaysObject(this.intervalStart.clone(),this.intervalEnd.clone()),months:[],year:null,month:null,eventsLastMonth:[],eventsNextMonth:[],eventsThisMonth:[],extras:this.options.extras,daysOfTheWeek:this.daysOfTheWeek,intervalEnd:this.intervalEnd.clone(),numberOfRows:Math.ceil(e.length/7),intervalStart:this.intervalStart.clone(),eventsThisInterval:this.eventsThisInterval};else if(this.options.lengthOfTime.months){for(n=[],i=[],t=a=0;t<this.options.lengthOfTime.months;t++)o=(r=this.intervalStart.clone().add(t,"months")).clone().endOf("month"),e=this.createDaysObject(r,o),i.push(this.eventsThisInterval),n.push({days:e,month:r});for(t=0;t<n.length;t++)a+=Math.ceil(n[t].days.length/7);h={days:[],year:null,month:null,months:n,eventsThisMonth:[],numberOfRows:a,extras:this.options.extras,intervalEnd:this.intervalEnd,intervalStart:this.intervalStart,daysOfTheWeek:this.daysOfTheWeek,eventsLastMonth:this.eventsLastMonth,eventsNextMonth:this.eventsNextMonth,eventsThisInterval:i}}else h={days:e=this.createDaysObject(this.month.clone().startOf("month"),this.month.clone().endOf("month")),months:[],intervalEnd:null,intervalStart:null,year:this.month.year(),eventsThisInterval:null,extras:this.options.extras,month:this.month.format("MMMM"),daysOfTheWeek:this.daysOfTheWeek,eventsLastMonth:this.eventsLastMonth,eventsNextMonth:this.eventsNextMonth,numberOfRows:Math.ceil(e.length/7),eventsThisMonth:this.eventsThisInterval};if(this.options.render?this.calendarContainer.html(this.options.render.apply(this,[h])):this.calendarContainer.html(this.compiledClndrTemplate(h)),this.options.constraints){for(s in this.options.targets)"day"!==s&&this.element.find("."+this.options.targets[s]).toggleClass(this.options.classes.inactive,!1);for(t in this.constraints)this.constraints[t]=!0;this.options.constraints.startDate&&(d=u(this.options.constraints.startDate)),this.options.constraints.endDate&&(l=u(this.options.constraints.endDate)),d&&(d.isAfter(this.intervalStart)||d.isSame(this.intervalStart,"day"))&&(this.element.find("."+this.options.targets.previousButton).toggleClass(this.options.classes.inactive,!0),this.constraints.previous=!this.constraints.previous),l&&(l.isBefore(this.intervalEnd)||l.isSame(this.intervalEnd,"day"))&&(this.element.find("."+this.options.targets.nextButton).toggleClass(this.options.classes.inactive,!0),this.constraints.next=!this.constraints.next),d&&d.isAfter(p)&&(this.element.find("."+this.options.targets.previousYearButton).toggleClass(this.options.classes.inactive,!0),this.constraints.previousYear=!this.constraints.previousYear),l&&l.isBefore(c)&&(this.element.find("."+this.options.targets.nextYearButton).toggleClass(this.options.classes.inactive,!0),this.constraints.nextYear=!this.constraints.nextYear),(d&&d.isAfter(u(),"month")||l&&l.isBefore(u(),"month"))&&(this.element.find("."+this.options.targets.today).toggleClass(this.options.classes.inactive,!0),this.constraints.today=!this.constraints.today)}this.options.doneRendering&&this.options.doneRendering.apply(this,[])},n.prototype.bindEvents=function(){var t,a=this,i=p(this.element),e=this.options.targets,o=a.options.classes,n=(!0===this.options.useTouchEvents?"touchstart":"click")+".clndr";i.off(n,"."+e.day).off(n,"."+e.empty).off(n,"."+e.nextButton).off(n,"."+e.todayButton).off(n,"."+e.previousButton).off(n,"."+e.nextYearButton).off(n,"."+e.previousYearButton),i.on(n,"."+e.day,function(t){function e(){if(a.options.adjacentDaysChangeMonth){if(s.is("."+o.lastMonth))return a.backActionWithContext(a),!0;if(s.is("."+o.nextMonth))return a.forwardActionWithContext(a),!0}}var n,s=p(t.currentTarget);!a.options.trackSelectedDate||a.options.ignoreInactiveDaysInSelection&&s.hasClass(o.inactive)?e():!0!==e()&&(a.options.selectedDate=a.getTargetDateString(t.currentTarget),i.find("."+o.selected).removeClass(o.selected),s.addClass(o.selected)),a.options.clickEvents.click&&(n=a.buildTargetObject(t.currentTarget,!0),a.options.clickEvents.click.apply(a,[n]))}),i.on(n,"."+e.empty,function(t){var e,n=p(t.currentTarget);a.options.clickEvents.click&&(e=a.buildTargetObject(t.currentTarget,!1),a.options.clickEvents.click.apply(a,[e])),a.options.adjacentDaysChangeMonth&&(n.is("."+o.lastMonth)?a.backActionWithContext(a):n.is("."+o.nextMonth)&&a.forwardActionWithContext(a))}),t={context:this},i.on(n,"."+e.todayButton,t,this.todayAction).on(n,"."+e.nextButton,t,this.forwardAction).on(n,"."+e.previousButton,t,this.backAction).on(n,"."+e.nextYearButton,t,this.nextYearAction).on(n,"."+e.previousYearButton,t,this.previousYearAction)},n.prototype.buildTargetObject=function(t,e){var n,s,a,i={date:null,events:[],element:t};return e&&(s=this.getTargetDateString(t),i.date=s?u(s):null,this.options.events&&(n=this.options.multiDayEvents?(a=i.date.clone().endOf("day"),function(){return this._clndrStartDateObject<=a&&i.date<=this._clndrEndDateObject}):function(){return s===this._clndrStartDateObject.format("YYYY-MM-DD")},i.events=p.makeArray(p(this.options.events).filter(n)))),i},n.prototype.getTargetDateString=function(t){var e=t.className.indexOf("calendar-day-");return-1!==e?t.className.substring(e+13,e+23):null},n.prototype.triggerEvents=function(t,e){var n,s,a,i,o,r,h,l,d,c=[u(t.month)],p=t.options.lengthOfTime,v=t.options.clickEvents,y={end:t.intervalEnd,start:t.intervalStart},f=[u(t.intervalStart),u(t.intervalEnd)];a=y.start.isAfter(e.start)&&(1===Math.abs(y.start.month()-e.start.month())||11===e.start.month()&&0===y.start.month()),i=y.start.isBefore(e.start)&&(1===Math.abs(e.start.month()-y.start.month())||0===e.start.month()&&11===y.start.month()),r=y.start.month()!==e.start.month()||y.start.year()!==e.start.year(),n=y.start.year()-e.start.year()==1||y.end.year()-e.end.year()==1,s=e.start.year()-y.start.year()==1||e.end.year()-y.end.year()==1,o=y.start.year()!==e.start.year(),p.days||p.months?(h=y.start.isAfter(e.start),l=y.start.isBefore(e.start),d=h||l,h&&v.nextInterval&&v.nextInterval.apply(t,f),l&&v.previousInterval&&v.previousInterval.apply(t,f),d&&v.onIntervalChange&&v.onIntervalChange.apply(t,f)):(a&&v.nextMonth&&v.nextMonth.apply(t,c),i&&v.previousMonth&&v.previousMonth.apply(t,c),r&&v.onMonthChange&&v.onMonthChange.apply(t,c),n&&v.nextYear&&v.nextYear.apply(t,c),s&&v.previousYear&&v.previousYear.apply(t,c),o&&v.onYearChange&&v.onYearChange.apply(t,c))},n.prototype.back=function(t){var e=arguments[1]||this,n=e.options.lengthOfTime,s={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};return t=p.extend(!0,{},{withCallbacks:!1},t),e.constraints.previous&&(n.days?(e.intervalStart.subtract(n.interval,"days").startOf("day"),e.intervalEnd=e.intervalStart.clone().add(n.days-1,"days").endOf("day")):(e.intervalStart.subtract(n.interval,"months").startOf("month"),e.intervalEnd=e.intervalStart.clone().add(n.months||n.interval,"months").subtract(1,"days").endOf("month")),e.month=e.intervalStart.clone(),e.render(),t.withCallbacks&&e.triggerEvents(e,s)),e},n.prototype.backAction=function(t){var e=t.data.context;e.backActionWithContext(e)},n.prototype.backActionWithContext=function(t){t.back({withCallbacks:!0},t)},n.prototype.previous=function(t){return this.back(t)},n.prototype.forward=function(t){var e=arguments[1]||this,n=e.options.lengthOfTime,s={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};return t=p.extend(!0,{},{withCallbacks:!1},t),e.constraints.next&&(e.options.lengthOfTime.days?(e.intervalStart.add(n.interval,"days").startOf("day"),e.intervalEnd=e.intervalStart.clone().add(n.days-1,"days").endOf("day")):(e.intervalStart.add(n.interval,"months").startOf("month"),e.intervalEnd=e.intervalStart.clone().add(n.months||n.interval,"months").subtract(1,"days").endOf("month")),e.month=e.intervalStart.clone(),e.render(),t.withCallbacks&&e.triggerEvents(e,s)),e},n.prototype.forwardAction=function(t){var e=t.data.context;e.forwardActionWithContext(e)},n.prototype.forwardActionWithContext=function(t){t.forward({withCallbacks:!0},t)},n.prototype.next=function(t){return this.forward(t)},n.prototype.previousYear=function(t){var e=arguments[1]||this,n={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};return t=p.extend(!0,{},{withCallbacks:!1},t),e.constraints.previousYear&&(e.month.subtract(1,"year"),e.intervalStart.subtract(1,"year"),e.intervalEnd.subtract(1,"year"),e.render(),t.withCallbacks&&e.triggerEvents(e,n)),e},n.prototype.previousYearAction=function(t){t.data.context.previousYear({withCallbacks:!0},t.data.context)},n.prototype.nextYear=function(t){var e=arguments[1]||this,n={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};return t=p.extend(!0,{},{withCallbacks:!1},t),e.constraints.nextYear&&(e.month.add(1,"year"),e.intervalStart.add(1,"year"),e.intervalEnd.add(1,"year"),e.render(),t.withCallbacks&&e.triggerEvents(e,n)),e},n.prototype.nextYearAction=function(t){t.data.context.nextYear({withCallbacks:!0},t.data.context)},n.prototype.today=function(t){var e=arguments[1]||this,n=e.options.lengthOfTime,s={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};t=p.extend(!0,{},{withCallbacks:!1},t),e.month=u().startOf("month"),n.days?(n.startDate?e.intervalStart=u().weekday(n.startDate.weekday()).startOf("day"):e.intervalStart=u().weekday(0).startOf("day"),e.intervalEnd=e.intervalStart.clone().add(n.days-1,"days").endOf("day")):(e.intervalStart=u().startOf("month"),e.intervalEnd=e.intervalStart.clone().add(n.months||n.interval,"months").subtract(1,"days").endOf("month")),e.intervalStart.isSame(s.start)&&e.intervalEnd.isSame(s.end)||e.render(),t.withCallbacks&&(e.options.clickEvents.today&&e.options.clickEvents.today.apply(e,[u(e.month)]),e.triggerEvents(e,s))},n.prototype.todayAction=function(t){t.data.context.today({withCallbacks:!0},t.data.context)},n.prototype.setMonth=function(t,e){var n=this.options.lengthOfTime,s={end:this.intervalEnd.clone(),start:this.intervalStart.clone()};return n.days||n.months?console.warn("clndr.js: You are using a custom date interval. Use Clndr.setIntervalStart(startDate) instead."):(this.month.month(t),this.intervalStart=this.month.clone().startOf("month"),this.intervalEnd=this.intervalStart.clone().endOf("month"),this.render(),e&&e.withCallbacks&&this.triggerEvents(this,s)),this},n.prototype.setYear=function(t,e){var n={end:this.intervalEnd.clone(),start:this.intervalStart.clone()};return this.month.year(t),this.intervalEnd.year(t),this.intervalStart.year(t),this.render(),e&&e.withCallbacks&&this.triggerEvents(this,n),this},n.prototype.setIntervalStart=function(t,e){var n=this.options.lengthOfTime,s={end:this.intervalEnd.clone(),start:this.intervalStart.clone()};return n.days||n.months?(n.days?(this.intervalStart=u(t).startOf("day"),this.intervalEnd=this.intervalStart.clone().add(n.days-1,"days").endOf("day")):(this.intervalStart=u(t).startOf("month"),this.intervalEnd=this.intervalStart.clone().add(n.months||n.interval,"months").subtract(1,"days").endOf("month")),this.month=this.intervalStart.clone(),this.render(),e&&e.withCallbacks&&this.triggerEvents(this,s)):console.warn("clndr.js: You are using a custom date interval. Use Clndr.setIntervalStart(startDate) instead."),this},n.prototype.setExtras=function(t){return this.options.extras=t,this.render(),this},n.prototype.setEvents=function(t){return this.options.multiDayEvents?this.options.events=this.addMultiDayMomentObjectsToEvents(t):this.options.events=this.addMomentObjectToEvents(t),this.render(),this},n.prototype.addEvents=function(t){var e=!(1<arguments.length)||arguments[1];return this.options.multiDayEvents?this.options.events=p.merge(this.options.events,this.addMultiDayMomentObjectsToEvents(t)):this.options.events=p.merge(this.options.events,this.addMomentObjectToEvents(t)),e&&this.render(),this},n.prototype.removeEvents=function(t){var e;for(e=this.options.events.length-1;0<=e;e--)!0===t(this.options.events[e])&&this.options.events.splice(e,1);return this.render(),this},n.prototype.addMomentObjectToEvents=function(t){for(var e=0;e<t.length;e++)t[e]._clndrStartDateObject=u(t[e][this.options.dateParameter]),t[e]._clndrEndDateObject=u(t[e][this.options.dateParameter]);return t},n.prototype.addMultiDayMomentObjectsToEvents=function(t){for(var e,n,s=0,a=this.options.multiDayEvents;s<t.length;s++)e=t[s][a.endDate],n=t[s][a.startDate],e||n?(t[s]._clndrEndDateObject=u(e||n),t[s]._clndrStartDateObject=u(n||e)):(t[s]._clndrEndDateObject=u(t[s][a.singleDay]),t[s]._clndrStartDateObject=u(t[s][a.singleDay]));return t},n.prototype.calendarDay=function(t){var e={day:"",date:null,events:[],classes:this.options.targets.empty};return p.extend({},e,t)},n.prototype.destroy=function(){var t=p(this.calendarContainer);t.parent().data("plugin_clndr",null),t.empty().remove(),this.options=a,this.element=null},p.fn.clndr=function(t){var e;if(1<this.length)throw new Error("CLNDR does not support multiple elements yet. Make sure your clndr selector returns only one element.");if(!this.length)throw new Error("CLNDR cannot be instantiated on an empty selector.");return this.data("plugin_clndr")?this.data("plugin_clndr"):(e=new n(this,t),this.data("plugin_clndr",e),e)}});
\ No newline at end of file
+!function(t){"function"==typeof define&&define.amd?define(["jquery","dayjs","weekday"],t):"object"==typeof exports?t(require("jquery"),require("dayjs"),require("dayjs/plugin/weekday")):t(jQuery,dayjs,weekday)}(function(v,u,t){u.extend(t);var a={events:[],ready:null,extras:null,render:null,moment:null,weekOffset:0,constraints:null,forceSixRows:null,selectedDate:null,doneRendering:null,daysOfTheWeek:null,multiDayEvents:null,startWithMonth:null,dateParameter:"date",template:"<div class='clndr-controls'><div class='clndr-control-button'><span class='clndr-previous-button'>previous</span></div><div class='month'><%= month %> <%= year %></div><div class='clndr-control-button rightalign'><span class='clndr-next-button'>next</span></div></div><table class='clndr-table' border='0' cellspacing='0' cellpadding='0'><thead><tr class='header-days'><% for(var i = 0; i < daysOfTheWeek.length; i++) { %><td class='header-day'><%= daysOfTheWeek[i] %></td><% } %></tr></thead><tbody><% for(var i = 0; i < numberOfRows; i++){ %><tr><% for(var j = 0; j < 7; j++){ %><% var d = j + i * 7; %><td class='<%= days[d].classes %>'><div class='day-contents'><%= days[d].day %></div></td><% } %></tr><% } %></tbody></table>",showAdjacentMonths:!0,trackSelectedDate:!1,formatWeekdayHeader:null,adjacentDaysChangeMonth:!1,ignoreInactiveDaysInSelection:null,lengthOfTime:{days:null,interval:1,months:null},clickEvents:{click:null,today:null,nextYear:null,nextMonth:null,nextInterval:null,previousYear:null,onYearChange:null,previousMonth:null,onMonthChange:null,previousInterval:null,onIntervalChange:null},targets:{day:"day",empty:"empty",nextButton:"clndr-next-button",todayButton:"clndr-today-button",previousButton:"clndr-previous-button",nextYearButton:"clndr-next-year-button",previousYearButton:"clndr-previous-year-button"},classes:{past:"past",today:"today",event:"event",inactive:"inactive",selected:"selected",lastMonth:"last-month",nextMonth:"next-month",adjacentMonth:"adjacent-month"}};function n(t,e){var n,s;this.element=t,this.options=v.extend(!0,{},a,e),this.options.moment&&(u=this.options.moment),this.validateOptions(),this.constraints={next:!0,today:!0,previous:!0,nextYear:!0,previousYear:!0},this.options.events.length&&(this.options.multiDayEvents?this.options.events=this.addMultiDayMomentObjectsToEvents(this.options.events):this.options.events=this.addMomentObjectToEvents(this.options.events)),this.options.lengthOfTime.months||this.options.lengthOfTime.days?this.options.lengthOfTime.months?(this.options.lengthOfTime.days=null,this.options.lengthOfTime.startDate?this.intervalStart=u(this.options.lengthOfTime.startDate).startOf("month"):this.options.startWithMonth?this.intervalStart=u(this.options.startWithMonth).startOf("month"):this.intervalStart=u().startOf("month"),this.intervalEnd=u(this.intervalStart).add(this.options.lengthOfTime.months,"month").subtract(1,"day"),this.month=this.intervalStart.clone()):this.options.lengthOfTime.days&&(this.options.lengthOfTime.startDate?this.intervalStart=u(this.options.lengthOfTime.startDate).startOf("day"):this.intervalStart=u().weekday(this.options.weekOffset).startOf("day"),this.intervalEnd=u(this.intervalStart).add(this.options.lengthOfTime.days-1,"day").endOf("day"),this.month=this.intervalStart.clone()):(this.month=u().startOf("month"),this.intervalStart=u(this.month),this.intervalEnd=u(this.month).endOf("month")),this.options.startWithMonth&&(this.month=u(this.options.startWithMonth).startOf("month"),this.intervalStart=u(this.month),this.intervalEnd=this.options.lengthOfTime.days?u(this.month).add(this.options.lengthOfTime.days-1,"day").endOf("day"):u(this.month).endOf("month")),this.options.constraints&&(this.options.constraints.startDate&&(s=u(this.options.constraints.startDate),this.options.lengthOfTime.days?(this.intervalStart.isBefore(s,"week")&&(this.intervalStart=s.startOf("week")),(this.intervalStart.diff(this.intervalEnd,"day")<this.options.lengthOfTime.days||this.intervalEnd.isBefore(this.intervalStart))&&(this.intervalEnd=u(this.intervalStart).add(this.options.lengthOfTime.days-1,"day").endOf("day"),this.month=this.intervalStart.clone())):(this.intervalStart.isBefore(s,"month")&&(this.intervalStart.month(s.month()).year(s.year()),this.month.month(s.month()).year(s.year())),this.intervalEnd.isBefore(s,"month")&&this.intervalEnd.month(s.month()).year(s.year()))),this.options.constraints.endDate&&(n=u(this.options.constraints.endDate),this.options.lengthOfTime.days?this.intervalStart.isAfter(n,"week")&&(this.intervalStart=u(n).endOf("week").subtract(this.options.lengthOfTime.days-1,"day").startOf("day"),this.intervalEnd=u(n).endOf("week"),this.month=this.intervalStart.clone()):(this.intervalEnd.isAfter(n,"month")&&(this.intervalEnd.month(n.month()).year(n.year()),this.month.month(n.month()).year(n.year())),this.intervalStart.isAfter(n,"month")&&this.intervalStart.month(n.month()).year(n.year())))),this._defaults=a,this._name="clndr",this.init()}n.prototype.init=function(){var t,e;if(this.daysOfTheWeek=this.options.daysOfTheWeek||[],e=this.options.formatWeekdayHeader||e,!this.options.daysOfTheWeek)for(this.daysOfTheWeek=[],e=this.options.formatWeekdayHeader||function(t){return t.format("dd").charAt(0)},t=0;t<7;t++)this.daysOfTheWeek.push(e(u().weekday(t)));if(this.options.weekOffset&&(this.daysOfTheWeek=this.shiftWeekdayLabels(this.options.weekOffset)),!v.isFunction(this.options.render)){if(this.options.render=null,"undefined"==typeof _)throw new Error("Underscore was not found. Please include underscore.js OR provide a custom render function.");this.compiledClndrTemplate=_.template(this.options.template)}v(this.element).html("<div class='clndr'></div>"),this.calendarContainer=v(".clndr",this.element),this.bindEvents(),this.render(),this.options.ready&&this.options.ready.apply(this,[])},n.prototype.validateOptions=function(){(6<this.options.weekOffset||this.options.weekOffset<0)&&(console.warn("clndr.js: An invalid offset "+this.options.weekOffset+" was provided (must be 0 - 6); using 0 instead."),this.options.weekOffset=0)},n.prototype.shiftWeekdayLabels=function(t){var e,n=this.daysOfTheWeek;for(e=0;e<t;e++)n.push(n.shift());return n},n.prototype.createDaysObject=function(e,n){var t,s,a,i,o,r,h,l,d=[],c=e.clone();n.diff(e,"day");if(this._currentIntervalStart=e.clone(),this.eventsLastMonth=[],this.eventsNextMonth=[],this.eventsThisInterval=[],this.options.events.length&&(this.eventsThisInterval=v(this.options.events).filter(function(){var t=this._clndrStartDateObject.isAfter(n);return!this._clndrEndDateObject.isBefore(e)&&!t}).toArray(),this.options.showAdjacentMonths&&(l=e.clone().subtract(1,"month").startOf("month"),r=l.clone().endOf("month"),h=n.clone().add(1,"month").startOf("month"),o=h.clone().endOf("month"),this.eventsLastMonth=v(this.options.events).filter(function(){var t=this._clndrEndDateObject.isBefore(l),e=this._clndrStartDateObject.isAfter(r);return!(t||e)}).toArray(),this.eventsNextMonth=v(this.options.events).filter(function(){var t=this._clndrEndDateObject.isBefore(h),e=this._clndrStartDateObject.isAfter(o);return!(t||e)}).toArray())),!this.options.lengthOfTime.days)if((a=c.weekday()-this.options.weekOffset)<0&&(a+=7),this.options.showAdjacentMonths)for(t=1;t<=a;t++){var p=new Date(e.year(),e.month(),t);s=u(p).subtract(a,"day"),d.push(this.createDayObject(s,this.eventsLastMonth))}else for(t=0;t<a;t++)d.push(this.calendarDay({classes:this.options.targets.empty+" "+this.options.classes.lastMonth}));for(i=e.clone();i.isBefore(n)||i.isSame(n,"day");)d.push(this.createDayObject(i.clone(),this.eventsThisInterval)),i.add(1,"day");if(!this.options.lengthOfTime.days)for(;d.length%7!=0;)this.options.showAdjacentMonths?d.push(this.createDayObject(i.clone(),this.eventsNextMonth)):d.push(this.calendarDay({classes:this.options.targets.empty+" "+this.options.classes.nextMonth})),i.add(1,"day");if(this.options.forceSixRows&&42!==d.length)for(;d.length<42;)this.options.showAdjacentMonths?(d.push(this.createDayObject(i.clone(),this.eventsNextMonth)),i.add(1,"day")):d.push(this.calendarDay({classes:this.options.targets.empty+" "+this.options.classes.nextMonth}));return d},n.prototype.createDayObject=function(t,e){var n,s,a,i,o,r,h=0,l=u(),d=[],c="",p={isToday:!1,isInactive:!1,isAdjacentMonth:!1};for(!t.isValid()&&t.hasOwnProperty("_d")&&void 0!==t._d&&(t=u(t._d)),a=t.clone().endOf("day");h<e.length;h++)s=e[h]._clndrStartDateObject,n=e[h]._clndrEndDateObject,s<=a&&t<=n&&d.push(e[h]);return l.format("YYYY-MM-DD")===t.format("YYYY-MM-DD")&&(c+=" "+this.options.classes.today,p.isToday=!0),t.isBefore(l,"day")&&(c+=" "+this.options.classes.past),d.length&&(c+=" "+this.options.classes.event),this.options.lengthOfTime.days||(this._currentIntervalStart.month()>t.month()?(c+=" "+this.options.classes.adjacentMonth,p.isAdjacentMonth=!0,this._currentIntervalStart.year()===t.year()?c+=" "+this.options.classes.lastMonth:c+=" "+this.options.classes.nextMonth):this._currentIntervalStart.month()<t.month()&&(c+=" "+this.options.classes.adjacentMonth,p.isAdjacentMonth=!0,this._currentIntervalStart.year()===t.year()?c+=" "+this.options.classes.nextMonth:c+=" "+this.options.classes.lastMonth)),this.options.constraints&&(i=u(this.options.constraints.endDate),o=u(this.options.constraints.startDate),this.options.constraints.startDate&&t.isBefore(o)&&(c+=" "+this.options.classes.inactive,p.isInactive=!0),this.options.constraints.endDate&&t.isAfter(i)&&(c+=" "+this.options.classes.inactive,p.isInactive=!0)),!t.isValid()&&t.hasOwnProperty("_d")&&void 0!==t._d&&(t=u(t._d)),r=u(this.options.selectedDate),this.options.selectedDate&&t.isSame(r,"day")&&(c+=" "+this.options.classes.selected),c+=" calendar-day-"+t.format("YYYY-MM-DD"),c+=" calendar-dow-"+t.weekday(),this.calendarDay({date:t,day:t.date(),events:d,properties:p,classes:this.options.targets.day+c})},n.prototype.render=function(){var t,e,n,s,a,i,o,r,h={},l=null,d=null,c=this.intervalEnd.clone().add(1,"year"),p=this.intervalStart.clone().subtract(1,"year");if(this.calendarContainer.empty(),this.options.lengthOfTime.days)h={days:e=this.createDaysObject(this.intervalStart.clone(),this.intervalEnd.clone()),months:[],year:null,month:null,eventsLastMonth:[],eventsNextMonth:[],eventsThisMonth:[],extras:this.options.extras,daysOfTheWeek:this.daysOfTheWeek,intervalEnd:this.intervalEnd.clone(),numberOfRows:Math.ceil(e.length/7),intervalStart:this.intervalStart.clone(),eventsThisInterval:this.eventsThisInterval};else if(this.options.lengthOfTime.months){for(n=[],i=[],t=a=0;t<this.options.lengthOfTime.months;t++)o=(r=this.intervalStart.clone().add(t,"month")).clone().endOf("month"),e=this.createDaysObject(r,o),i.push(this.eventsThisInterval),n.push({days:e,month:r});for(t=0;t<n.length;t++)a+=Math.ceil(n[t].days.length/7);h={days:[],year:null,month:null,months:n,eventsThisMonth:[],numberOfRows:a,extras:this.options.extras,intervalEnd:this.intervalEnd,intervalStart:this.intervalStart,daysOfTheWeek:this.daysOfTheWeek,eventsLastMonth:this.eventsLastMonth,eventsNextMonth:this.eventsNextMonth,eventsThisInterval:i}}else h={days:e=this.createDaysObject(this.month.clone().startOf("month"),this.month.clone().endOf("month")),months:[],intervalEnd:null,intervalStart:null,year:this.month.year(),eventsThisInterval:null,extras:this.options.extras,month:this.month.format("MMMM"),daysOfTheWeek:this.daysOfTheWeek,eventsLastMonth:this.eventsLastMonth,eventsNextMonth:this.eventsNextMonth,numberOfRows:Math.ceil(e.length/7),eventsThisMonth:this.eventsThisInterval};if(this.options.render?this.calendarContainer.html(this.options.render.apply(this,[h])):this.calendarContainer.html(this.compiledClndrTemplate(h)),this.options.constraints){for(s in this.options.targets)"day"!==s&&this.element.find("."+this.options.targets[s]).toggleClass(this.options.classes.inactive,!1);for(t in this.constraints)this.constraints[t]=!0;this.options.constraints.startDate&&(d=u(this.options.constraints.startDate)),this.options.constraints.endDate&&(l=u(this.options.constraints.endDate)),d&&(d.isAfter(this.intervalStart)||d.isSame(this.intervalStart,"day"))&&(this.element.find("."+this.options.targets.previousButton).toggleClass(this.options.classes.inactive,!0),this.constraints.previous=!this.constraints.previous),l&&(l.isBefore(this.intervalEnd)||l.isSame(this.intervalEnd,"day"))&&(this.element.find("."+this.options.targets.nextButton).toggleClass(this.options.classes.inactive,!0),this.constraints.next=!this.constraints.next),d&&d.isAfter(p)&&(this.element.find("."+this.options.targets.previousYearButton).toggleClass(this.options.classes.inactive,!0),this.constraints.previousYear=!this.constraints.previousYear),l&&l.isBefore(c)&&(this.element.find("."+this.options.targets.nextYearButton).toggleClass(this.options.classes.inactive,!0),this.constraints.nextYear=!this.constraints.nextYear),(d&&d.isAfter(u(),"month")||l&&l.isBefore(u(),"month"))&&(this.element.find("."+this.options.targets.today).toggleClass(this.options.classes.inactive,!0),this.constraints.today=!this.constraints.today)}this.options.doneRendering&&this.options.doneRendering.apply(this,[])},n.prototype.bindEvents=function(){var t,a=this,i=v(this.element),e=this.options.targets,o=a.options.classes,n=(!0===this.options.useTouchEvents?"touchstart":"click")+".clndr";i.off(n,"."+e.day).off(n,"."+e.empty).off(n,"."+e.nextButton).off(n,"."+e.todayButton).off(n,"."+e.previousButton).off(n,"."+e.nextYearButton).off(n,"."+e.previousYearButton),i.on(n,"."+e.day,function(t){function e(){if(a.options.adjacentDaysChangeMonth){if(s.is("."+o.lastMonth))return a.backActionWithContext(a),!0;if(s.is("."+o.nextMonth))return a.forwardActionWithContext(a),!0}}var n,s=v(t.currentTarget);!a.options.trackSelectedDate||a.options.ignoreInactiveDaysInSelection&&s.hasClass(o.inactive)?e():!0!==e()&&(a.options.selectedDate=a.getTargetDateString(t.currentTarget),i.find("."+o.selected).removeClass(o.selected),s.addClass(o.selected)),a.options.clickEvents.click&&(n=a.buildTargetObject(t.currentTarget,!0),a.options.clickEvents.click.apply(a,[n]))}),i.on(n,"."+e.empty,function(t){var e,n=v(t.currentTarget);a.options.clickEvents.click&&(e=a.buildTargetObject(t.currentTarget,!1),a.options.clickEvents.click.apply(a,[e])),a.options.adjacentDaysChangeMonth&&(n.is("."+o.lastMonth)?a.backActionWithContext(a):n.is("."+o.nextMonth)&&a.forwardActionWithContext(a))}),t={context:this},i.on(n,"."+e.todayButton,t,this.todayAction).on(n,"."+e.nextButton,t,this.forwardAction).on(n,"."+e.previousButton,t,this.backAction).on(n,"."+e.nextYearButton,t,this.nextYearAction).on(n,"."+e.previousYearButton,t,this.previousYearAction)},n.prototype.buildTargetObject=function(t,e){var n,s,a,i={date:null,events:[],element:t};return e&&(s=this.getTargetDateString(t),i.date=s?u(s):null,this.options.events&&(n=this.options.multiDayEvents?(a=i.date.clone().endOf("day"),function(){return this._clndrStartDateObject<=a&&i.date<=this._clndrEndDateObject}):function(){return s===this._clndrStartDateObject.format("YYYY-MM-DD")},i.events=v.makeArray(v(this.options.events).filter(n)))),i},n.prototype.getTargetDateString=function(t){var e=t.className.indexOf("calendar-day-");return-1!==e?t.className.substring(e+13,e+23):null},n.prototype.triggerEvents=function(t,e){var n,s,a,i,o,r,h,l,d,c=[u(t.month)],p=t.options.lengthOfTime,v=t.options.clickEvents,y={end:t.intervalEnd,start:t.intervalStart},f=[u(t.intervalStart),u(t.intervalEnd)];a=y.start.isAfter(e.start)&&(1===Math.abs(y.start.month()-e.start.month())||11===e.start.month()&&0===y.start.month()),i=y.start.isBefore(e.start)&&(1===Math.abs(e.start.month()-y.start.month())||0===e.start.month()&&11===y.start.month()),r=y.start.month()!==e.start.month()||y.start.year()!==e.start.year(),n=y.start.year()-e.start.year()==1||y.end.year()-e.end.year()==1,s=e.start.year()-y.start.year()==1||e.end.year()-y.end.year()==1,o=y.start.year()!==e.start.year(),p.days||p.months?(h=y.start.isAfter(e.start),l=y.start.isBefore(e.start),d=h||l,h&&v.nextInterval&&v.nextInterval.apply(t,f),l&&v.previousInterval&&v.previousInterval.apply(t,f),d&&v.onIntervalChange&&v.onIntervalChange.apply(t,f)):(a&&v.nextMonth&&v.nextMonth.apply(t,c),i&&v.previousMonth&&v.previousMonth.apply(t,c),r&&v.onMonthChange&&v.onMonthChange.apply(t,c),n&&v.nextYear&&v.nextYear.apply(t,c),s&&v.previousYear&&v.previousYear.apply(t,c),o&&v.onYearChange&&v.onYearChange.apply(t,c))},n.prototype.back=function(t){var e=arguments[1]||this,n=e.options.lengthOfTime,s={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};return t=v.extend(!0,{},{withCallbacks:!1},t),e.constraints.previous&&(n.days?(e.intervalStart.subtract(n.interval,"day").startOf("day"),e.intervalEnd=e.intervalStart.clone().add(n.days-1,"day").endOf("day")):(e.intervalStart.subtract(n.interval,"month").startOf("month"),e.intervalEnd=e.intervalStart.clone().add(n.months||n.interval,"month").subtract(1,"day").endOf("month")),e.month=e.intervalStart.clone(),e.render(),t.withCallbacks&&e.triggerEvents(e,s)),e},n.prototype.backAction=function(t){var e=t.data.context;e.backActionWithContext(e)},n.prototype.backActionWithContext=function(t){t.back({withCallbacks:!0},t)},n.prototype.previous=function(t){return this.back(t)},n.prototype.forward=function(t){var e=arguments[1]||this,n=e.options.lengthOfTime,s={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};return t=v.extend(!0,{},{withCallbacks:!1},t),e.constraints.next&&(e.options.lengthOfTime.days?(e.intervalStart.add(n.interval,"day").startOf("day"),e.intervalEnd=e.intervalStart.clone().add(n.days-1,"day").endOf("day")):(e.intervalStart.add(n.interval,"month").startOf("month"),e.intervalEnd=e.intervalStart.clone().add(n.months||n.interval,"month").subtract(1,"day").endOf("month")),e.month=e.intervalStart.clone(),e.render(),t.withCallbacks&&e.triggerEvents(e,s)),e},n.prototype.forwardAction=function(t){var e=t.data.context;e.forwardActionWithContext(e)},n.prototype.forwardActionWithContext=function(t){t.forward({withCallbacks:!0},t)},n.prototype.next=function(t){return this.forward(t)},n.prototype.previousYear=function(t){var e=arguments[1]||this,n={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};return t=v.extend(!0,{},{withCallbacks:!1},t),e.constraints.previousYear&&(e.month.subtract(1,"year"),e.intervalStart.subtract(1,"year"),e.intervalEnd.subtract(1,"year"),e.render(),t.withCallbacks&&e.triggerEvents(e,n)),e},n.prototype.previousYearAction=function(t){t.data.context.previousYear({withCallbacks:!0},t.data.context)},n.prototype.nextYear=function(t){var e=arguments[1]||this,n={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};return t=v.extend(!0,{},{withCallbacks:!1},t),e.constraints.nextYear&&(e.month.add(1,"year"),e.intervalStart.add(1,"year"),e.intervalEnd.add(1,"year"),e.render(),t.withCallbacks&&e.triggerEvents(e,n)),e},n.prototype.nextYearAction=function(t){t.data.context.nextYear({withCallbacks:!0},t.data.context)},n.prototype.today=function(t){var e=arguments[1]||this,n=e.options.lengthOfTime,s={end:e.intervalEnd.clone(),start:e.intervalStart.clone()};t=v.extend(!0,{},{withCallbacks:!1},t),e.month=u().startOf("month"),n.days?(n.startDate?e.intervalStart=u().weekday(n.startDate.weekday()).startOf("day"):e.intervalStart=u().weekday(0).startOf("day"),e.intervalEnd=e.intervalStart.clone().add(n.days-1,"day").endOf("day")):(e.intervalStart=u().startOf("month"),e.intervalEnd=e.intervalStart.clone().add(n.months||n.interval,"month").subtract(1,"day").endOf("month")),e.intervalStart.isSame(s.start)&&e.intervalEnd.isSame(s.end)||e.render(),t.withCallbacks&&(e.options.clickEvents.today&&e.options.clickEvents.today.apply(e,[u(e.month)]),e.triggerEvents(e,s))},n.prototype.todayAction=function(t){t.data.context.today({withCallbacks:!0},t.data.context)},n.prototype.setMonth=function(t,e){var n=this.options.lengthOfTime,s={end:this.intervalEnd.clone(),start:this.intervalStart.clone()};return n.days||n.months?console.warn("clndr.js: You are using a custom date interval. Use Clndr.setIntervalStart(startDate) instead."):(this.month.month(t),this.intervalStart=this.month.clone().startOf("month"),this.intervalEnd=this.intervalStart.clone().endOf("month"),this.render(),e&&e.withCallbacks&&this.triggerEvents(this,s)),this},n.prototype.setYear=function(t,e){var n={end:this.intervalEnd.clone(),start:this.intervalStart.clone()};return this.month.year(t),this.intervalEnd.year(t),this.intervalStart.year(t),this.render(),e&&e.withCallbacks&&this.triggerEvents(this,n),this},n.prototype.setIntervalStart=function(t,e){var n=this.options.lengthOfTime,s={end:this.intervalEnd.clone(),start:this.intervalStart.clone()};return n.days||n.months?(n.days?(this.intervalStart=u(t).startOf("day"),this.intervalEnd=this.intervalStart.clone().add(n.days-1,"day").endOf("day")):(this.intervalStart=u(t).startOf("month"),this.intervalEnd=this.intervalStart.clone().add(n.months||n.interval,"month").subtract(1,"day").endOf("month")),this.month=this.intervalStart.clone(),this.render(),e&&e.withCallbacks&&this.triggerEvents(this,s)):console.warn("clndr.js: You are using a custom date interval. Use Clndr.setIntervalStart(startDate) instead."),this},n.prototype.setExtras=function(t){return this.options.extras=t,this.render(),this},n.prototype.setEvents=function(t){return this.options.multiDayEvents?this.options.events=this.addMultiDayMomentObjectsToEvents(t):this.options.events=this.addMomentObjectToEvents(t),this.render(),this},n.prototype.addEvents=function(t){var e=!(1<arguments.length)||arguments[1];return this.options.multiDayEvents?this.options.events=v.merge(this.options.events,this.addMultiDayMomentObjectsToEvents(t)):this.options.events=v.merge(this.options.events,this.addMomentObjectToEvents(t)),e&&this.render(),this},n.prototype.removeEvents=function(t){var e;for(e=this.options.events.length-1;0<=e;e--)!0===t(this.options.events[e])&&this.options.events.splice(e,1);return this.render(),this},n.prototype.addMomentObjectToEvents=function(t){for(var e=0;e<t.length;e++)t[e]._clndrStartDateObject=u(t[e][this.options.dateParameter]),t[e]._clndrEndDateObject=u(t[e][this.options.dateParameter]);return t},n.prototype.addMultiDayMomentObjectsToEvents=function(t){for(var e,n,s=0,a=this.options.multiDayEvents;s<t.length;s++)e=t[s][a.endDate],n=t[s][a.startDate],e||n?(t[s]._clndrEndDateObject=u(e||n),t[s]._clndrStartDateObject=u(n||e)):(t[s]._clndrEndDateObject=u(t[s][a.singleDay]),t[s]._clndrStartDateObject=u(t[s][a.singleDay]));return t},n.prototype.calendarDay=function(t){var e={day:"",date:null,events:[],classes:this.options.targets.empty};return v.extend({},e,t)},n.prototype.destroy=function(){var t=v(this.calendarContainer);t.parent().data("plugin_clndr",null),t.empty().remove(),this.options=a,this.element=null},v.fn.clndr=function(t){var e;if(1<this.length)throw new Error("CLNDR does not support multiple elements yet. Make sure your clndr selector returns only one element.");if(!this.length)throw new Error("CLNDR cannot be instantiated on an empty selector.");return this.data("plugin_clndr")?this.data("plugin_clndr"):(e=new n(this,t),this.data("plugin_clndr",e),e)}});
\ No newline at end of file
diff --git a/demo/demo.js b/demo/demo.js
index c28ba4a..17fec1b 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -11,7 +11,7 @@ $(document).ready( function() {
     // moment.locale('ru');
 
     // Here's some magic to make sure the dates are happening this month.
-    var thisMonth = moment().format('YYYY-MM');
+    var thisMonth = dayjs().format('YYYY-MM');
     // Events to load into calendar
     var eventArray = [
         {
@@ -152,4 +152,4 @@ $(document).ready( function() {
             calendars.clndr3.forward();
         }
     });
-});
\ No newline at end of file
+});
diff --git a/demo/index.html b/demo/index.html
index 6eb5e59..bbb8724 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -64,8 +64,10 @@
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"></script>
+<!--    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"></script>-->
+    <script src="https://cdn.jsdelivr.net/npm/dayjs@1.8.22/plugin/weekday.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/dayjs@1.8.22/dayjs.min.js"></script>
     <script src="../src/clndr.js"></script>
     <script src="demo.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/package.json b/package.json
index b7f3308..9cdf4f8 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
   "homepage": "https://github.com/kylestetz/CLNDR",
   "main": "src/clndr.js",
   "dependencies": {
+    "dayjs": "^1.8.22",
     "jquery": ">=1.9",
     "moment": ">=2.8.3"
   },
diff --git a/src/clndr.js b/src/clndr.js
index 85eae39..89c9544 100644
--- a/src/clndr.js
+++ b/src/clndr.js
@@ -24,20 +24,23 @@
   // here, the instance can be passed in at config time.
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['jquery', 'moment'], factory);
+    define(['jquery', 'dayjs', 'weekday'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS
-    factory(require('jquery'), require('moment'));
+    let weekday = require('dayjs/plugin/weekday');
+
+    factory(require('jquery'), require('dayjs'), weekday);
   } else {
     // Browser globals
-    factory(jQuery, moment);
+    factory(jQuery, dayjs, window.dayjs_plugin_weekday || weekday);
   }
-}(function ($, moment) {
+}(function ($, dayjs, weekday) {
+  dayjs.extend(weekday);
   // Namespace
-  var pluginName = 'clndr';
+  let pluginName = 'clndr';
 
   // This is the default calendar template. This can be overridden.
-  var clndrTemplate =
+  let clndrTemplate =
     "<div class='clndr-controls'>" +
         "<div class='clndr-control-button'>" +
             "<span class='clndr-previous-button'>previous</span>" +
@@ -50,16 +53,16 @@
     "<table class='clndr-table' border='0' cellspacing='0' cellpadding='0'>" +
         '<thead>' +
             "<tr class='header-days'>" +
-            '<% for(var i = 0; i < daysOfTheWeek.length; i++) { %>' +
+            '<% for(let i = 0; i < daysOfTheWeek.length; i++) { %>' +
                 "<td class='header-day'><%= daysOfTheWeek[i] %></td>" +
             '<% } %>' +
             '</tr>' +
         '</thead>' +
         '<tbody>' +
-        '<% for(var i = 0; i < numberOfRows; i++){ %>' +
+        '<% for(let i = 0; i < numberOfRows; i++){ %>' +
             '<tr>' +
-            '<% for(var j = 0; j < 7; j++){ %>' +
-            '<% var d = j + i * 7; %>' +
+            '<% for(let j = 0; j < 7; j++){ %>' +
+            '<% let d = j + i * 7; %>' +
                 "<td class='<%= days[d].classes %>'>" +
                     "<div class='day-contents'><%= days[d].day %></div>" +
                 '</td>' +
@@ -70,7 +73,7 @@
     '</table>';
 
   // Defaults used throughout the application, see docs.
-  var defaults = {
+  let defaults = {
     events: [],
     ready: null,
     extras: null,
@@ -136,9 +139,9 @@
    * objects containing event information from the events array.
    */
   function Clndr (element, options) {
-    var dayDiff;
-    var constraintEnd;
-    var constraintStart;
+    let dayDiff;
+    let constraintEnd;
+    let constraintStart;
 
     this.element = element;
 
@@ -147,7 +150,7 @@
 
     // Check if moment was passed in as a dependency
     if (this.options.moment) {
-      moment = this.options.moment;
+      dayjs = this.options.moment;
     }
 
     // Validate any correct options
@@ -191,59 +194,59 @@
         // The length is specified in months. Is there a start date?
         if (this.options.lengthOfTime.startDate) {
           this.intervalStart =
-            moment(this.options.lengthOfTime.startDate).startOf('month');
+            dayjs(this.options.lengthOfTime.startDate).startOf('month');
         } else if (this.options.startWithMonth) {
           this.intervalStart =
-            moment(this.options.startWithMonth).startOf('month');
+            dayjs(this.options.startWithMonth).startOf('month');
         } else {
-          this.intervalStart = moment().startOf('month');
+          this.intervalStart = dayjs().startOf('month');
         }
 
         // Subtract a day so that we are at the end of the interval. We
         // always want intervalEnd to be inclusive.
-        this.intervalEnd = moment(this.intervalStart)
-          .add(this.options.lengthOfTime.months, 'months')
-          .subtract(1, 'days');
-        this.month = this.intervalStart.clone();
+        this.intervalEnd = dayjs(this.intervalStart)
+          .add(this.options.lengthOfTime.months, 'month')
+          .subtract(1, 'day');
+        this.month = this.clone(this.intervalStart);
       } else if (this.options.lengthOfTime.days) {
         // The length is specified in days. Start date?
         if (this.options.lengthOfTime.startDate) {
           this.intervalStart =
-            moment(this.options.lengthOfTime.startDate).startOf('day');
+            dayjs(this.options.lengthOfTime.startDate).startOf('day');
         } else {
-          this.intervalStart = moment()
+          this.intervalStart = dayjs()
             .weekday(this.options.weekOffset)
             .startOf('day');
         }
 
-        this.intervalEnd = moment(this.intervalStart)
-          .add(this.options.lengthOfTime.days - 1, 'days')
+        this.intervalEnd = dayjs(this.intervalStart)
+          .add(this.options.lengthOfTime.days - 1, 'day')
           .endOf('day');
-        this.month = this.intervalStart.clone();
+        this.month = this.clone(this.intervalStart);
       }
     // No length of time specified so we're going to default into using the
     // current month as the time period.
     } else {
-      this.month = moment().startOf('month');
-      this.intervalStart = moment(this.month);
-      this.intervalEnd = moment(this.month).endOf('month');
+      this.month = dayjs().startOf('month');
+      this.intervalStart = dayjs(this.month);
+      this.intervalEnd = dayjs(this.month).endOf('month');
     }
 
     if (this.options.startWithMonth) {
-      this.month = moment(this.options.startWithMonth).startOf('month');
-      this.intervalStart = moment(this.month);
+      this.month = dayjs(this.options.startWithMonth).startOf('month');
+      this.intervalStart = dayjs(this.month);
       this.intervalEnd = this.options.lengthOfTime.days
-        ? moment(this.month)
-          .add(this.options.lengthOfTime.days - 1, 'days')
+        ? dayjs(this.month)
+          .add(this.options.lengthOfTime.days - 1, 'day')
           .endOf('day')
-        : moment(this.month).endOf('month');
+        : dayjs(this.month).endOf('month');
     }
 
     // If we've got constraints set, make sure the interval is within them.
     if (this.options.constraints) {
       // First check if the startDate exists & is later than now.
       if (this.options.constraints.startDate) {
-        constraintStart = moment(this.options.constraints.startDate);
+        constraintStart = dayjs(this.options.constraints.startDate);
 
         // We need to handle the constraints differently for weekly
         // calendars vs. monthly calendars.
@@ -254,68 +257,68 @@
 
           // If the new interval period is less than the desired length
           // of time, or before the starting interval, then correct it.
-          dayDiff = this.intervalStart.diff(this.intervalEnd, 'days');
+          dayDiff = this.intervalStart.diff(this.intervalEnd, 'day');
 
           if (dayDiff < this.options.lengthOfTime.days ||
               this.intervalEnd.isBefore(this.intervalStart)
           ) {
-            this.intervalEnd = moment(this.intervalStart)
-              .add(this.options.lengthOfTime.days - 1, 'days')
+            this.intervalEnd = dayjs(this.intervalStart)
+              .add(this.options.lengthOfTime.days - 1, 'day')
               .endOf('day');
-            this.month = this.intervalStart.clone();
+            this.month = this.clone(this.intervalStart);
           }
         } else {
           if (this.intervalStart.isBefore(constraintStart, 'month')) {
             // Try to preserve the date by moving only the month.
             this.intervalStart
-              .set('month', constraintStart.month())
-              .set('year', constraintStart.year());
+              .month(constraintStart.month())
+              .year(constraintStart.year());
             this.month
-              .set('month', constraintStart.month())
-              .set('year', constraintStart.year());
+              .month(constraintStart.month())
+              .year(constraintStart.year());
           }
 
           // Check if the ending interval is earlier than now.
           if (this.intervalEnd.isBefore(constraintStart, 'month')) {
             this.intervalEnd
-              .set('month', constraintStart.month())
-              .set('year', constraintStart.year());
+              .month(constraintStart.month())
+              .year(constraintStart.year());
           }
         }
       }
 
       // Make sure the intervalEnd is before the endDate.
       if (this.options.constraints.endDate) {
-        constraintEnd = moment(this.options.constraints.endDate);
+        constraintEnd = dayjs(this.options.constraints.endDate);
 
         // We need to handle the constraints differently for weekly
         // calendars vs. monthly calendars.
         if (this.options.lengthOfTime.days) {
           // The starting interval is after our ending constraint.
           if (this.intervalStart.isAfter(constraintEnd, 'week')) {
-            this.intervalStart = moment(constraintEnd)
+            this.intervalStart = dayjs(constraintEnd)
               .endOf('week')
-              .subtract(this.options.lengthOfTime.days - 1, 'days')
+              .subtract(this.options.lengthOfTime.days - 1, 'day')
               .startOf('day');
-            this.intervalEnd = moment(constraintEnd)
+            this.intervalEnd = dayjs(constraintEnd)
               .endOf('week');
-            this.month = this.intervalStart.clone();
+            this.month = this.clone(this.intervalStart);
           }
         } else {
           if (this.intervalEnd.isAfter(constraintEnd, 'month')) {
             this.intervalEnd
-              .set('month', constraintEnd.month())
-              .set('year', constraintEnd.year());
+              .month(constraintEnd.month())
+              .year(constraintEnd.year());
             this.month
-              .set('month', constraintEnd.month())
-              .set('year', constraintEnd.year());
+              .month(constraintEnd.month())
+              .year(constraintEnd.year());
           }
 
           // Check if the starting interval is later than the ending.
           if (this.intervalStart.isAfter(constraintEnd, 'month')) {
             this.intervalStart
-              .set('month', constraintEnd.month())
-              .set('year', constraintEnd.year());
+              .month(constraintEnd.month())
+              .year(constraintEnd.year());
           }
         }
       }
@@ -330,14 +333,18 @@
     this.init();
   }
 
+  Clndr.prototype.clone = function ($obj) {
+    return dayjs($obj.valueOf());
+  };
+
   /**
    * Calendar initialization.
    * Sets up the days of the week, the rendering function, binds all of the
    * events to the rendered calendar, and then stores the node locally.
    */
   Clndr.prototype.init = function () {
-    var i;
-    var formatWeekday;
+    let i;
+    let formatWeekday;
 
     // Create the days of the week using moment's current language setting
     this.daysOfTheWeek = this.options.daysOfTheWeek || [];
@@ -353,7 +360,7 @@
       };
 
       for (i = 0; i < 7; i++) {
-        this.daysOfTheWeek.push(formatWeekday(moment().weekday(i)));
+        this.daysOfTheWeek.push(formatWeekday(dayjs().weekday(i)));
       }
     }
 
@@ -405,8 +412,8 @@
   };
 
   Clndr.prototype.shiftWeekdayLabels = function (offset) {
-    var i;
-    var days = this.daysOfTheWeek;
+    let i;
+    let days = this.daysOfTheWeek;
 
     for (i = 0; i < offset; i++) {
       days.push(days.shift());
@@ -421,22 +428,22 @@
    * events and classes depending on the circumstance.
    */
   Clndr.prototype.createDaysObject = function (startDate, endDate) {
-    var i;
-    var day;
-    var diff;
-    var dateIterator;
+    let i;
+    let day;
+    let diff;
+    let dateIterator;
     // This array will hold numbers for the entire grid (even the blank spaces)
-    var daysArray = [];
-    var endOfNextMonth;
-    var endOfLastMonth;
-    var startOfNextMonth;
-    var startOfLastMonth;
-    var date = startDate.clone();
-    var lengthOfInterval = endDate.diff(startDate, 'days');
+    let daysArray = [];
+    let endOfNextMonth;
+    let endOfLastMonth;
+    let startOfNextMonth;
+    let startOfLastMonth;
+    let date = this.clone(startDate);
+    let lengthOfInterval = endDate.diff(startDate, 'day');
 
     // This is a helper object so that days can resolve their classes
     // correctly. Don't use it for anything please.
-    this._currentIntervalStart = startDate.clone();
+    this._currentIntervalStart = this.clone(startDate);
 
     // Filter the events list (if it exists) to events that are happening
     // last month, this month and next month (within the current grid view).
@@ -452,8 +459,8 @@
       //   e.start   | e.end   | startDate | endDate
       this.eventsThisInterval = $(this.options.events).filter(
         function () {
-          var afterEnd = this._clndrStartDateObject.isAfter(endDate);
-          var beforeStart = this._clndrEndDateObject.isBefore(startDate);
+          let afterEnd = this._clndrStartDateObject.isAfter(endDate);
+          let beforeStart = this._clndrEndDateObject.isBefore(startDate);
 
           if (beforeStart || afterEnd) {
             return false;
@@ -462,31 +469,23 @@
         }).toArray();
 
       if (this.options.showAdjacentMonths) {
-        startOfLastMonth = startDate.clone()
-          .subtract(1, 'months')
-          .startOf('month');
-        endOfLastMonth = startOfLastMonth.clone().endOf('month');
-        startOfNextMonth = endDate.clone()
-          .add(1, 'months')
-          .startOf('month');
-        endOfNextMonth = startOfNextMonth.clone().endOf('month');
+        startOfLastMonth = this.clone(startDate).subtract(1, 'month').startOf('month');
+        endOfLastMonth = this.clone(startOfLastMonth).endOf('month');
+        startOfNextMonth = this.clone(endDate).add(1, 'month').startOf('month');
+        endOfNextMonth = this.clone(startOfNextMonth).endOf('month');
 
         this.eventsLastMonth = $(this.options.events).filter(
           function () {
-            var beforeStart = this._clndrEndDateObject
-              .isBefore(startOfLastMonth);
-            var afterEnd = this._clndrStartDateObject
-              .isAfter(endOfLastMonth);
+            let beforeStart = this._clndrEndDateObject.isBefore(startOfLastMonth);
+            let afterEnd = this._clndrStartDateObject.isAfter(endOfLastMonth);
 
             return !(beforeStart || afterEnd);
           }).toArray();
 
         this.eventsNextMonth = $(this.options.events).filter(
           function () {
-            var beforeStart = this._clndrEndDateObject
-              .isBefore(startOfNextMonth);
-            var afterEnd = this._clndrStartDateObject
-              .isAfter(endOfNextMonth);
+            let beforeStart = this._clndrEndDateObject.isBefore(startOfNextMonth);
+            let afterEnd = this._clndrStartDateObject.isAfter(endOfNextMonth);
 
             return !(beforeStart || afterEnd);
           }).toArray();
@@ -507,16 +506,11 @@
 
       if (this.options.showAdjacentMonths) {
         for (i = 1; i <= diff; i++) {
-          day = moment([
-            startDate.year(),
-            startDate.month(),
-            i
-          ]).subtract(diff, 'days');
+          let d = new Date(startDate.year(), startDate.month(), i);
+
+          day = dayjs(d).subtract(diff, 'day');
           daysArray.push(
-            this.createDayObject(
-              day,
-              this.eventsLastMonth
-            ));
+            this.createDayObject(day, this.eventsLastMonth));
         }
       } else {
         for (i = 0; i < diff; i++) {
@@ -530,15 +524,15 @@
     }
 
     // Now we push all of the days in the interval
-    dateIterator = startDate.clone();
+    dateIterator = this.clone(startDate);
 
     while (dateIterator.isBefore(endDate) || dateIterator.isSame(endDate, 'day')) {
       daysArray.push(
         this.createDayObject(
-          dateIterator.clone(),
+          this.clone(dateIterator),
           this.eventsThisInterval
         ));
-      dateIterator.add(1, 'days');
+      dateIterator.add(1, 'day');
     }
 
     // ...and if there are any trailing blank boxes, fill those in with the
@@ -549,7 +543,7 @@
         if (this.options.showAdjacentMonths) {
           daysArray.push(
             this.createDayObject(
-              dateIterator.clone(),
+              this.clone(dateIterator),
               this.eventsNextMonth
             ));
         } else {
@@ -559,7 +553,7 @@
                 this.options.classes.nextMonth
             }));
         }
-        dateIterator.add(1, 'days');
+        dateIterator.add(1, 'day');
       }
     }
 
@@ -571,10 +565,10 @@
         if (this.options.showAdjacentMonths) {
           daysArray.push(
             this.createDayObject(
-              dateIterator.clone(),
+              this.clone(dateIterator),
               this.eventsNextMonth
             ));
-          dateIterator.add(1, 'days');
+          dateIterator.add(1, 'day');
         } else {
           daysArray.push(this.calendarDay({
             classes: this.options.targets.empty + ' ' +
@@ -588,17 +582,17 @@
   };
 
   Clndr.prototype.createDayObject = function (day, monthEvents) {
-    var end;
-    var j = 0;
-    var start;
-    var dayEnd;
-    var endMoment;
-    var startMoment;
-    var selectedMoment;
-    var now = moment();
-    var eventsToday = [];
-    var extraClasses = '';
-    var properties = {
+    let end;
+    let j = 0;
+    let start;
+    let dayEnd;
+    let endMoment;
+    let startMoment;
+    let selectedMoment;
+    let now = dayjs();
+    let eventsToday = [];
+    let extraClasses = '';
+    let properties = {
       isToday: false,
       isInactive: false,
       isAdjacentMonth: false
@@ -606,11 +600,11 @@
 
     // Validate moment date
     if (!day.isValid() && day.hasOwnProperty('_d') && day._d !== undefined) {
-      day = moment(day._d);
+      day = dayjs(day._d);
     }
 
     // Set to the end of the day for comparisons
-    dayEnd = day.clone().endOf('day');
+    dayEnd = this.clone(day).endOf('day');
 
     for (j; j < monthEvents.length; j++) {
       // Keep in mind that the events here already passed the month/year
@@ -661,8 +655,8 @@
     // If there are constraints, we need to add the inactive class to the
     // days outside of them
     if (this.options.constraints) {
-      endMoment = moment(this.options.constraints.endDate);
-      startMoment = moment(this.options.constraints.startDate);
+      endMoment = dayjs(this.options.constraints.endDate);
+      startMoment = dayjs(this.options.constraints.startDate);
 
       if (this.options.constraints.startDate && day.isBefore(startMoment)) {
         extraClasses += (' ' + this.options.classes.inactive);
@@ -677,11 +671,11 @@
 
     // Validate moment date
     if (!day.isValid() && day.hasOwnProperty('_d') && day._d !== undefined) {
-      day = moment(day._d);
+      day = dayjs(day._d);
     }
 
     // Check whether the day is "selected"
-    selectedMoment = moment(this.options.selectedDate);
+    selectedMoment = dayjs(this.options.selectedDate);
 
     if (this.options.selectedDate && day.isSame(selectedMoment, 'day')) {
       extraClasses += (' ' + this.options.classes.selected);
@@ -714,26 +708,26 @@
    * the elements themselves.
    */
   Clndr.prototype.render = function () {
-    var i;
-    var days;
-    var months;
-    var target;
-    var data = {};
-    var end = null;
-    var start = null;
-    var numberOfRows;
-    var eventsThisInterval;
-    var currentIntervalEnd;
-    var currentIntervalStart;
-    var oneYearFromEnd = this.intervalEnd.clone().add(1, 'years');
-    var oneYearAgo = this.intervalStart.clone().subtract(1, 'years');
+    let i;
+    let days;
+    let months;
+    let target;
+    let data = {};
+    let end = null;
+    let start = null;
+    let numberOfRows;
+    let eventsThisInterval;
+    let currentIntervalEnd;
+    let currentIntervalStart;
+    let oneYearFromEnd = this.clone(this.intervalEnd).add(1, 'year');
+    let oneYearAgo = this.clone(this.intervalStart).subtract(1, 'year');
 
     this.calendarContainer.empty();
 
     if (this.options.lengthOfTime.days) {
       days = this.createDaysObject(
-        this.intervalStart.clone(),
-        this.intervalEnd.clone());
+        this.clone(this.intervalStart),
+        this.clone(this.intervalEnd));
       data = {
         days: days,
         months: [],
@@ -744,9 +738,9 @@
         eventsThisMonth: [],
         extras: this.options.extras,
         daysOfTheWeek: this.daysOfTheWeek,
-        intervalEnd: this.intervalEnd.clone(),
+        intervalEnd: this.clone(this.intervalEnd),
         numberOfRows: Math.ceil(days.length / 7),
-        intervalStart: this.intervalStart.clone(),
+        intervalStart: this.clone(this.intervalStart),
         eventsThisInterval: this.eventsThisInterval
       };
     } else if (this.options.lengthOfTime.months) {
@@ -755,11 +749,9 @@
       eventsThisInterval = [];
 
       for (i = 0; i < this.options.lengthOfTime.months; i++) {
-        currentIntervalStart = this.intervalStart
-          .clone()
-          .add(i, 'months');
-        currentIntervalEnd = currentIntervalStart
-          .clone()
+        currentIntervalStart = this.clone(this.intervalStart)
+          .add(i, 'month');
+        currentIntervalEnd = this.clone(currentIntervalStart)
           .endOf('month');
         days = this.createDaysObject(currentIntervalStart, currentIntervalEnd);
         // Save events processed for each month into a master array of
@@ -794,8 +786,8 @@
     } else {
       // Get an array of days and blank spaces
       days = this.createDaysObject(
-        this.month.clone().startOf('month'),
-        this.month.clone().endOf('month')
+        this.clone(this.month).startOf('month'),
+        this.clone(this.month).endOf('month')
       );
 
       data = {
@@ -842,11 +834,11 @@
       }
 
       if (this.options.constraints.startDate) {
-        start = moment(this.options.constraints.startDate);
+        start = dayjs(this.options.constraints.startDate);
       }
 
       if (this.options.constraints.endDate) {
-        end = moment(this.options.constraints.endDate);
+        end = dayjs(this.options.constraints.endDate);
       }
 
       // Deal with the month controls first. Do we have room to go back?
@@ -887,8 +879,8 @@
 
       // Today? We could put this in init(), but we want to support the
       // user changing the constraints on a living instance.
-      if ((start && start.isAfter(moment(), 'month')) ||
-          (end && end.isBefore(moment(), 'month'))
+      if ((start && start.isAfter(dayjs(), 'month')) ||
+          (end && end.isBefore(dayjs(), 'month'))
       ) {
         this.element.find('.' + this.options.targets.today)
           .toggleClass(this.options.classes.inactive, true);
@@ -902,15 +894,15 @@
   };
 
   Clndr.prototype.bindEvents = function () {
-    var data = {};
-    var self = this;
-    var $container = $(this.element);
-    var targets = this.options.targets;
-    var classes = self.options.classes;
-    var eventType = this.options.useTouchEvents === true
+    let data = {};
+    let self = this;
+    let $container = $(this.element);
+    let targets = this.options.targets;
+    let classes = self.options.classes;
+    let eventType = this.options.useTouchEvents === true
       ? 'touchstart'
       : 'click';
-    var eventName = eventType + '.clndr';
+    let eventName = eventType + '.clndr';
 
     // Make sure we don't already have events
     $container
@@ -924,13 +916,13 @@
 
     // Target the day elements and give them click events
     $container.on(eventName, '.' + targets.day, function (event) {
-      var target;
-      var $currentTarget = $(event.currentTarget);
+      let target;
+      let $currentTarget = $(event.currentTarget);
 
       // If adjacentDaysChangeMonth is on, we need to change the
       // month here. Forward and Back trigger render() to be called.
       // This is a callback because it can be triggered in two places.
-      var handleAdjacentDay = function () {
+      let handleAdjacentDay = function () {
         if (self.options.adjacentDaysChangeMonth) {
           if ($currentTarget.is('.' + classes.lastMonth)) {
             self.backActionWithContext(self);
@@ -972,8 +964,8 @@
 
     // Target the empty calendar boxes as well
     $container.on(eventName, '.' + targets.empty, function (event) {
-      var target;
-      var $eventTarget = $(event.currentTarget);
+      let target;
+      let $eventTarget = $(event.currentTarget);
 
       if (self.options.clickEvents.click) {
         target = self.buildTargetObject(event.currentTarget, false);
@@ -1013,27 +1005,27 @@
   Clndr.prototype.buildTargetObject = function (currentTarget, targetWasDay) {
     // This is our default target object, assuming we hit an empty day
     // with no events.
-    var target = {
+    let target = {
       date: null,
       events: [],
       element: currentTarget
     };
-    var filterFn;
-    var dateString;
-    var targetEndDate;
+    let filterFn;
+    let dateString;
+    let targetEndDate;
 
     // Did we click on a day or just an empty box?
     if (targetWasDay) {
       dateString = this.getTargetDateString(currentTarget);
       target.date = dateString
-        ? moment(dateString)
+        ? dayjs(dateString)
         : null;
 
       // Do we have events?
       if (this.options.events) {
         // Are any of the events happening today?
         if (this.options.multiDayEvents) {
-          targetEndDate = target.date.clone().endOf('day');
+          targetEndDate = this.clone(target.date).endOf('day');
           filterFn = function () {
             return this._clndrStartDateObject <= targetEndDate &&
               target.date <= this._clndrEndDateObject;
@@ -1058,7 +1050,7 @@
    */
   Clndr.prototype.getTargetDateString = function (target) {
     // Our identifier is in the list of classNames. Find it!
-    var index = target.className.indexOf('calendar-day-');
+    let index = target.className.indexOf('calendar-day-');
 
     if (index !== -1) {
       // Our unique identifier is always 23 characters long.
@@ -1076,25 +1068,25 @@
    * orig contains the original start and end dates.
    */
   Clndr.prototype.triggerEvents = function (ctx, orig) {
-    var nextYear;
-    var prevYear;
-    var nextMonth;
-    var prevMonth;
-    var yearChanged;
-    var monthChanged;
-    var nextInterval;
-    var prevInterval;
-    var intervalChanged;
-    var monthArg = [moment(ctx.month)];
-    var timeOpt = ctx.options.lengthOfTime;
-    var eventsOpt = ctx.options.clickEvents;
-    var newInt = {
+    let nextYear;
+    let prevYear;
+    let nextMonth;
+    let prevMonth;
+    let yearChanged;
+    let monthChanged;
+    let nextInterval;
+    let prevInterval;
+    let intervalChanged;
+    let monthArg = [dayjs(ctx.month)];
+    let timeOpt = ctx.options.lengthOfTime;
+    let eventsOpt = ctx.options.clickEvents;
+    let newInt = {
       end: ctx.intervalEnd,
       start: ctx.intervalStart
     };
-    var intervalArg = [
-      moment(ctx.intervalStart),
-      moment(ctx.intervalEnd)
+    let intervalArg = [
+      dayjs(ctx.intervalStart),
+      dayjs(ctx.intervalEnd)
     ];
 
     // We want to determine if any of the change conditions have been
@@ -1164,14 +1156,14 @@
    * is an internal method that this library uses.
    */
   Clndr.prototype.back = function (options /*, ctx */) {
-    var ctx = arguments[ 1 ] || this;
-    var timeOpt = ctx.options.lengthOfTime;
-    var defaults = {
+    let ctx = arguments[ 1 ] || this;
+    let timeOpt = ctx.options.lengthOfTime;
+    let defaults = {
       withCallbacks: false
     };
-    var orig = {
-      end: ctx.intervalEnd.clone(),
-      start: ctx.intervalStart.clone()
+    let orig = {
+      end: this.clone(ctx.intervalEnd),
+      start: this.clone(ctx.intervalStart)
     };
 
     // Extend any options
@@ -1185,23 +1177,23 @@
     if (timeOpt.days) {
       // Shift the interval in days
       ctx.intervalStart
-        .subtract(timeOpt.interval, 'days')
+        .subtract(timeOpt.interval, 'day')
         .startOf('day');
-      ctx.intervalEnd = ctx.intervalStart.clone()
-        .add(timeOpt.days - 1, 'days')
+      ctx.intervalEnd = this.clone(ctx.intervalStart)
+        .add(timeOpt.days - 1, 'day')
         .endOf('day');
       // @V2-todo Useless, but consistent with API
-      ctx.month = ctx.intervalStart.clone();
+      ctx.month = this.clone(ctx.intervalStart);
     } else {
       // Shift the interval by a month (or several months)
       ctx.intervalStart
-        .subtract(timeOpt.interval, 'months')
+        .subtract(timeOpt.interval, 'month')
         .startOf('month');
-      ctx.intervalEnd = ctx.intervalStart.clone()
-        .add(timeOpt.months || timeOpt.interval, 'months')
-        .subtract(1, 'days')
+      ctx.intervalEnd = this.clone(ctx.intervalStart)
+        .add(timeOpt.months || timeOpt.interval, 'month')
+        .subtract(1, 'day')
         .endOf('month');
-      ctx.month = ctx.intervalStart.clone();
+      ctx.month = this.clone(ctx.intervalStart);
     }
 
     ctx.render();
@@ -1214,7 +1206,7 @@
   };
 
   Clndr.prototype.backAction = function (event) {
-    var ctx = event.data.context;
+    let ctx = event.data.context;
 
     ctx.backActionWithContext(ctx);
   };
@@ -1236,14 +1228,14 @@
    * which is an internal method that this library uses.
    */
   Clndr.prototype.forward = function (options /*, ctx */) {
-    var ctx = arguments[1] || this;
-    var timeOpt = ctx.options.lengthOfTime;
-    var defaults = {
+    let ctx = arguments[1] || this;
+    let timeOpt = ctx.options.lengthOfTime;
+    let defaults = {
       withCallbacks: false
     };
-    var orig = {
-      end: ctx.intervalEnd.clone(),
-      start: ctx.intervalStart.clone()
+    let orig = {
+      end: this.clone(ctx.intervalEnd),
+      start: this.clone(ctx.intervalStart)
     };
 
     // Extend any options
@@ -1257,23 +1249,23 @@
     if (ctx.options.lengthOfTime.days) {
       // Shift the interval in days
       ctx.intervalStart
-        .add(timeOpt.interval, 'days')
+        .add(timeOpt.interval, 'day')
         .startOf('day');
-      ctx.intervalEnd = ctx.intervalStart.clone()
-        .add(timeOpt.days - 1, 'days')
+      ctx.intervalEnd = this.clone(ctx.intervalStart)
+        .add(timeOpt.days - 1, 'day')
         .endOf('day');
       // @V2-todo Useless, but consistent with API
-      ctx.month = ctx.intervalStart.clone();
+      ctx.month = this.clone(ctx.intervalStart);
     } else {
       // Shift the interval by a month (or several months)
       ctx.intervalStart
-        .add(timeOpt.interval, 'months')
+        .add(timeOpt.interval, 'month')
         .startOf('month');
-      ctx.intervalEnd = ctx.intervalStart.clone()
-        .add(timeOpt.months || timeOpt.interval, 'months')
-        .subtract(1, 'days')
+      ctx.intervalEnd = this.clone(ctx.intervalStart)
+        .add(timeOpt.months || timeOpt.interval, 'month')
+        .subtract(1, 'day')
         .endOf('month');
-      ctx.month = ctx.intervalStart.clone();
+      ctx.month = this.clone(ctx.intervalStart);
     }
 
     ctx.render();
@@ -1286,7 +1278,7 @@
   };
 
   Clndr.prototype.forwardAction = function (event) {
-    var ctx = event.data.context;
+    let ctx = event.data.context;
 
     ctx.forwardActionWithContext(ctx);
   };
@@ -1306,13 +1298,13 @@
    * Main action to go back one year.
    */
   Clndr.prototype.previousYear = function (options /*, ctx */) {
-    var ctx = arguments[1] || this;
-    var defaults = {
+    let ctx = arguments[1] || this;
+    let defaults = {
       withCallbacks: false
     };
-    var orig = {
-      end: ctx.intervalEnd.clone(),
-      start: ctx.intervalStart.clone()
+    let orig = {
+      end: this.clone(ctx.intervalEnd),
+      start: this.clone(ctx.intervalStart)
     };
 
     // Extend any options
@@ -1345,13 +1337,13 @@
    * Main action to go forward one year.
    */
   Clndr.prototype.nextYear = function (options /*, ctx */) {
-    var ctx = arguments[1] || this;
-    var defaults = {
+    let ctx = arguments[1] || this;
+    let defaults = {
       withCallbacks: false
     };
-    var orig = {
-      end: ctx.intervalEnd.clone(),
-      start: ctx.intervalStart.clone()
+    let orig = {
+      end: this.clone(ctx.intervalEnd),
+      start: this.clone(ctx.intervalStart)
     };
 
     // Extend any options
@@ -1381,42 +1373,42 @@
   };
 
   Clndr.prototype.today = function (options /*, ctx */) {
-    var ctx = arguments[1] || this;
-    var timeOpt = ctx.options.lengthOfTime;
-    var defaults = {
+    let ctx = arguments[1] || this;
+    let timeOpt = ctx.options.lengthOfTime;
+    let defaults = {
       withCallbacks: false
     };
-    var orig = {
-      end: ctx.intervalEnd.clone(),
-      start: ctx.intervalStart.clone()
+    let orig = {
+      end: this.clone(ctx.intervalEnd),
+      start: this.clone(ctx.intervalStart)
     };
 
     // Extend any options
     options = $.extend(true, {}, defaults, options);
     // @V2-todo Only used for legacy month view
-    ctx.month = moment().startOf('month');
+    ctx.month = dayjs().startOf('month');
 
     if (timeOpt.days) {
       // If there was a startDate specified, we should figure out what
       // the weekday is and use that as the starting point of our
       // interval. If not, go to today.weekday(0).
       if (timeOpt.startDate) {
-        ctx.intervalStart = moment()
+        ctx.intervalStart = dayjs()
           .weekday(timeOpt.startDate.weekday())
           .startOf('day');
       } else {
-        ctx.intervalStart = moment().weekday(0).startOf('day');
+        ctx.intervalStart = dayjs().weekday(0).startOf('day');
       }
 
-      ctx.intervalEnd = ctx.intervalStart.clone()
-        .add(timeOpt.days - 1, 'days')
+      ctx.intervalEnd = this.clone(ctx.intervalStart)
+        .add(timeOpt.days - 1, 'day')
         .endOf('day');
     } else {
       // Set the intervalStart to this month.
-      ctx.intervalStart = moment().startOf('month');
-      ctx.intervalEnd = ctx.intervalStart.clone()
-        .add(timeOpt.months || timeOpt.interval, 'months')
-        .subtract(1, 'days')
+      ctx.intervalStart = dayjs().startOf('month');
+      ctx.intervalEnd = this.clone(ctx.intervalStart)
+        .add(timeOpt.months || timeOpt.interval, 'month')
+        .subtract(1, 'day')
         .endOf('month');
     }
 
@@ -1430,7 +1422,7 @@
     // Fire the today event handler regardless of any change
     if (options.withCallbacks) {
       if (ctx.options.clickEvents.today) {
-        ctx.options.clickEvents.today.apply(ctx, [moment(ctx.month)]);
+        ctx.options.clickEvents.today.apply(ctx, [dayjs(ctx.month)]);
       }
 
       ctx.triggerEvents(ctx, orig);
@@ -1448,10 +1440,10 @@
    * e.g. "Jan", "February", "Mar", etc.
    */
   Clndr.prototype.setMonth = function (newMonth, options) {
-    var timeOpt = this.options.lengthOfTime;
-    var orig = {
-      end: this.intervalEnd.clone(),
-      start: this.intervalStart.clone()
+    let timeOpt = this.options.lengthOfTime;
+    let orig = {
+      end: this.clone(this.intervalEnd),
+      start: this.clone(this.intervalStart)
     };
 
     if (timeOpt.days || timeOpt.months) {
@@ -1462,8 +1454,8 @@
     }
 
     this.month.month(newMonth);
-    this.intervalStart = this.month.clone().startOf('month');
-    this.intervalEnd = this.intervalStart.clone().endOf('month');
+    this.intervalStart = this.clone(this.month).startOf('month');
+    this.intervalEnd = this.clone(this.intervalStart).endOf('month');
     this.render();
 
     if (options && options.withCallbacks) {
@@ -1474,9 +1466,9 @@
   };
 
   Clndr.prototype.setYear = function (newYear, options) {
-    var orig = {
-      end: this.intervalEnd.clone(),
-      start: this.intervalStart.clone()
+    let orig = {
+      end: this.clone(this.intervalEnd),
+      start: this.clone(this.intervalStart)
     };
 
     this.month.year(newYear);
@@ -1496,10 +1488,10 @@
    * newDate can be a string or a moment object.
    */
   Clndr.prototype.setIntervalStart = function (newDate, options) {
-    var timeOpt = this.options.lengthOfTime;
-    var orig = {
-      end: this.intervalEnd.clone(),
-      start: this.intervalStart.clone()
+    let timeOpt = this.options.lengthOfTime;
+    let orig = {
+      end: this.clone(this.intervalEnd),
+      start: this.clone(this.intervalStart)
     };
 
     if (!timeOpt.days && !timeOpt.months) {
@@ -1510,19 +1502,19 @@
     }
 
     if (timeOpt.days) {
-      this.intervalStart = moment(newDate).startOf('day');
-      this.intervalEnd = this.intervalStart.clone()
-        .add(timeOpt.days - 1, 'days')
+      this.intervalStart = dayjs(newDate).startOf('day');
+      this.intervalEnd = this.clone(this.intervalStart)
+        .add(timeOpt.days - 1, 'day')
         .endOf('day');
     } else {
-      this.intervalStart = moment(newDate).startOf('month');
-      this.intervalEnd = this.intervalStart.clone()
-        .add(timeOpt.months || timeOpt.interval, 'months')
-        .subtract(1, 'days')
+      this.intervalStart = dayjs(newDate).startOf('month');
+      this.intervalEnd = this.clone(this.intervalStart)
+        .add(timeOpt.months || timeOpt.interval, 'month')
+        .subtract(1, 'day')
         .endOf('month');
     }
 
-    this.month = this.intervalStart.clone();
+    this.month = this.clone(this.intervalStart);
     this.render();
 
     if (options && options.withCallbacks) {
@@ -1562,7 +1554,7 @@
    * Adds additional events to the calendar and triggers a render.
    */
   Clndr.prototype.addEvents = function (events /*, reRender */) {
-    var reRender = arguments.length > 1
+    let reRender = arguments.length > 1
       ? arguments[1]
       : true;
 
@@ -1589,7 +1581,7 @@
    * test will be removed from the calendar's events. This triggers a render.
    */
   Clndr.prototype.removeEvents = function (matchingFn) {
-    var i;
+    let i;
 
     for (i = this.options.events.length - 1; i >= 0; i--) {
       if (matchingFn(this.options.events[i]) === true) {
@@ -1603,27 +1595,27 @@
   };
 
   Clndr.prototype.addMomentObjectToEvents = function (events) {
-    var i = 0;
-    var self = this;
+    let i = 0;
+    let self = this;
 
     for (i; i < events.length; i++) {
       // Add the date as both start and end, since it's a single-day
       // event by default
       events[i]._clndrStartDateObject =
-        moment(events[i][self.options.dateParameter]);
+        dayjs(events[i][self.options.dateParameter]);
       events[i]._clndrEndDateObject =
-        moment(events[i][self.options.dateParameter]);
+        dayjs(events[i][self.options.dateParameter]);
     }
 
     return events;
   };
 
   Clndr.prototype.addMultiDayMomentObjectsToEvents = function (events) {
-    var end;
-    var start;
-    var i = 0;
-    var self = this;
-    var multiEvents = self.options.multiDayEvents;
+    let end;
+    let start;
+    let i = 0;
+    let self = this;
+    let multiEvents = self.options.multiDayEvents;
 
     for (i; i < events.length; i++) {
       end = events[i][multiEvents.endDate];
@@ -1632,13 +1624,13 @@
       // If we don't find the startDate OR endDate fields, look for singleDay
       if (!end && !start) {
         events[i]._clndrEndDateObject =
-          moment(events[i][multiEvents.singleDay]);
+          dayjs(events[i][multiEvents.singleDay]);
         events[i]._clndrStartDateObject =
-          moment(events[i][multiEvents.singleDay]);
+          dayjs(events[i][multiEvents.singleDay]);
       } else {
         // Otherwise use startDate and endDate, or whichever one is present
-        events[i]._clndrEndDateObject = moment(end || start);
-        events[i]._clndrStartDateObject = moment(start || end);
+        events[i]._clndrEndDateObject = dayjs(end || start);
+        events[i]._clndrStartDateObject = dayjs(start || end);
       }
     }
 
@@ -1646,7 +1638,7 @@
   };
 
   Clndr.prototype.calendarDay = function (options) {
-    var defaults = {
+    let defaults = {
       day: '',
       date: null,
       events: [],
@@ -1657,7 +1649,7 @@
   };
 
   Clndr.prototype.destroy = function () {
-    var $container = $(this.calendarContainer);
+    let $container = $(this.calendarContainer);
 
     $container.parent().data('plugin_clndr', null);
     $container.empty().remove();
@@ -1666,8 +1658,9 @@
     this.element = null;
   };
 
+
   $.fn.clndr = function (options) {
-    var clndrInstance;
+    let clndrInstance;
 
     if (this.length > 1) {
       throw new Error(