From 1912a9127fd6c134604779256d881eaeab79c2b7 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Thu, 26 Sep 2019 15:32:53 -0400 Subject: [PATCH] Add computed properties for Date object for dates used in functions --- js/components/date_selector.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/js/components/date_selector.js b/js/components/date_selector.js index f6273231..e7372e75 100644 --- a/js/components/date_selector.js +++ b/js/components/date_selector.js @@ -102,8 +102,8 @@ export default { isYearValid: function() { // Emit a change event let valid - let minYear = this.mindate ? new Date(this.mindate).getFullYear() : null - let maxYear = this.maxdate ? new Date(this.maxdate).getFullYear() : null + let minYear = this.mindate ? this.minDateParsed.getFullYear() : null + let maxYear = this.maxdate ? this.maxDateParsed.getFullYear() : null if (minYear && maxYear) { valid = this.year >= minYear && this.year <= maxYear @@ -172,7 +172,7 @@ export default { minError: function() { if (this.isDateComplete) { - return new Date(this.mindate) > new Date(this.formattedDate) + return this.minDateParsed > this.dateParsed } return false @@ -180,11 +180,23 @@ export default { maxError: function() { if (this.isDateComplete) { - return new Date(this.maxdate) < new Date(this.formattedDate) + return this.maxDateParsed < this.dateParsed } return false }, + + maxDateParsed: function() { + return new Date(this.maxdate) + }, + + minDateParsed: function() { + return new Date(this.mindate) + }, + + dateParsed: function() { + return new Date(this.formattedDate) + }, }, methods: {