From 33e4aafae134eb26f6be99a8854d57c44f2abcfd Mon Sep 17 00:00:00 2001 From: Tyler van der Hoeven Date: Thu, 26 Jan 2017 14:11:46 -0500 Subject: [PATCH] trigger single calendar callback if not input is not required --- dev/js/Calendar.js | 19 +++++++++---------- public/js/Calendar.js | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dev/js/Calendar.js b/dev/js/Calendar.js index 188dec7..e2cc595 100644 --- a/dev/js/Calendar.js +++ b/dev/js/Calendar.js @@ -193,8 +193,7 @@ self.presetToggle(); if (self.calIsOpen) { - - if ($(self.selected).hasClass("dr-date-end")) + if ($(self.selected).hasClass('dr-date-end')) self.calendarSaveDates(); self.calendarSetDates(); @@ -319,11 +318,11 @@ Calendar.prototype.calendarSaveDates = function() { - if (this.type == 'double') { + if (this.type === 'double') { if (!moment(this.orig_end_date).isSame(this.end_date) || !moment(this.orig_start_date).isSame(this.start_date)) return this.callback(); } else { - if ($(this.selected).html().length && !moment(this.orig_current_date).isSame(this.current_date)) + if (!this.required || !moment(this.orig_current_date).isSame(this.current_date)) return this.callback(); } } @@ -765,19 +764,19 @@ var string = moment(date).format(cal.format.input); if (other) { - $('.dr-date', cal.element) - .not(cal.selected) - .html(other.format(cal.format.input)); + $('.dr-date', cal.element) + .not(cal.selected) + .html(other.format(cal.format.input)); } $(cal.selected).html(string); cal.calendarOpen(cal.selected); if ($(cal.selected).hasClass('dr-date-start')) { - $('.dr-date-end', cal.element).trigger('click'); + $('.dr-date-end', cal.element).trigger('click'); } else { - cal.calendarSaveDates(); - cal.calendarClose('force'); + cal.calendarSaveDates(); + cal.calendarClose('force'); } } diff --git a/public/js/Calendar.js b/public/js/Calendar.js index 188dec7..e2cc595 100644 --- a/public/js/Calendar.js +++ b/public/js/Calendar.js @@ -193,8 +193,7 @@ self.presetToggle(); if (self.calIsOpen) { - - if ($(self.selected).hasClass("dr-date-end")) + if ($(self.selected).hasClass('dr-date-end')) self.calendarSaveDates(); self.calendarSetDates(); @@ -319,11 +318,11 @@ Calendar.prototype.calendarSaveDates = function() { - if (this.type == 'double') { + if (this.type === 'double') { if (!moment(this.orig_end_date).isSame(this.end_date) || !moment(this.orig_start_date).isSame(this.start_date)) return this.callback(); } else { - if ($(this.selected).html().length && !moment(this.orig_current_date).isSame(this.current_date)) + if (!this.required || !moment(this.orig_current_date).isSame(this.current_date)) return this.callback(); } } @@ -765,19 +764,19 @@ var string = moment(date).format(cal.format.input); if (other) { - $('.dr-date', cal.element) - .not(cal.selected) - .html(other.format(cal.format.input)); + $('.dr-date', cal.element) + .not(cal.selected) + .html(other.format(cal.format.input)); } $(cal.selected).html(string); cal.calendarOpen(cal.selected); if ($(cal.selected).hasClass('dr-date-start')) { - $('.dr-date-end', cal.element).trigger('click'); + $('.dr-date-end', cal.element).trigger('click'); } else { - cal.calendarSaveDates(); - cal.calendarClose('force'); + cal.calendarSaveDates(); + cal.calendarClose('force'); } }