Merge 8ea5c0b into 7cc1c32

charliekassel · Mar 1, 2019 · f418c37 · f418c37
2 parents 7cc1c32 + 8ea5c0b
commit f418c37
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/src/components/DateInput.vue b/src/components/DateInput.vue
@@ -50,7 +50,11 @@ export default {
     id: String,
     name: String,
     refName: String,
-    openDate: Date,
+    openDate: {
+      validator: (val) => {
+        return val === null || val instanceof Date || typeof val === 'string' || typeof val === 'number'
+      }
+    },
     placeholder: String,
     inputClass: [String, Object, Array],
     clearButton: Boolean,

diff --git a/src/components/Datepicker.vue b/src/components/Datepicker.vue
@@ -158,6 +158,7 @@ export default {
   data () {
     const startDate = this.openDate ? new Date(this.openDate) : new Date()
     const constructedDateUtils = makeDateUtils(this.useUtc)
+    constructedDateUtils.resetDateTime(startDate)
     const pageTimestamp = constructedDateUtils.setDate(startDate, 1)
     return {
       /*
@@ -182,7 +183,7 @@ export default {
        * Positioning
        */
       calendarHeight: 0,
-      resetTypedDate: new Date(),
+      resetTypedDate: constructedDateUtils.getNewDateObject(),
       utils: constructedDateUtils
     }
   },
@@ -351,7 +352,7 @@ export default {
       if (!this.isInline) {
         this.close(true)
       }
-      this.resetTypedDate = new Date()
+      this.resetTypedDate = this.utils.getNewDateObject()
     },
     /**
      * @param {Object} date
@@ -412,6 +413,7 @@ export default {
         } else {
           date = new Date()
         }
+        this.utils.resetDateTime(date)
       }
       this.pageTimestamp = this.utils.setDate(new Date(date), 1)
     },

diff --git a/src/components/PickerDay.vue b/src/components/PickerDay.vue
@@ -103,7 +103,7 @@ export default {
           isHighlighted: this.isHighlightedDate(dObj),
           isHighlightStart: this.isHighlightStart(dObj),
           isHighlightEnd: this.isHighlightEnd(dObj),
-          isToday: this.utils.compareDates(dObj, new Date()),
+          isToday: this.utils.compareDates(dObj, this.utils.getNewDateObject()),
           isWeekend: this.utils.getDay(dObj) === 0 || this.utils.getDay(dObj) === 6,
           isSaturday: this.utils.getDay(dObj) === 6,
           isSunday: this.utils.getDay(dObj) === 0

diff --git a/src/utils/DateUtils.js b/src/utils/DateUtils.js
@@ -88,13 +88,9 @@ const utils = {
     const d1 = new Date(date1.getTime())
     const d2 = new Date(date2.getTime())
 
-    if (this.useUtc) {
-      d1.setUTCHours(0, 0, 0, 0)
-      d2.setUTCHours(0, 0, 0, 0)
-    } else {
-      d1.setHours(0, 0, 0, 0)
-      d2.setHours(0, 0, 0, 0)
-    }
+    this.resetDateTime(d1)
+    this.resetDateTime(d2)
+
     return d1.getTime() === d2.getTime()
   },
 
@@ -240,6 +236,30 @@ const utils = {
    */
   validateDateInput (val) {
     return val === null || val instanceof Date || typeof val === 'string' || typeof val === 'number'
+  },
+
+  /**
+   * Remove hours/minutes/seconds/milliseconds from a date object
+   * @param {Date} date
+   * @return {Date}
+   */
+  resetDateTime (date) {
+    if (this.useUtc) {
+      date.setUTCHours(0, 0, 0, 0)
+    } else {
+      date.setHours(0, 0, 0, 0)
+    }
+    return date
+  },
+
+  /**
+   * Return a new date object with hours/minutes/seconds/milliseconds removed
+   * @return {Date}
+   */
+  getNewDateObject () {
+    var d = new Date()
+    this.resetDateTime(d)
+    return d
   }
 }