From c2ca42812feeb0ea755bee3dc24791773e5bb439 Mon Sep 17 00:00:00 2001 From: Ignacio Tampe Palma Date: Mon, 11 Feb 2019 13:02:24 -0300 Subject: [PATCH 1/4] Fixing error with UTC not being handled correctly --- src/components/Datepicker.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Datepicker.vue b/src/components/Datepicker.vue index 67055bef..4fe43976 100644 --- a/src/components/Datepicker.vue +++ b/src/components/Datepicker.vue @@ -328,6 +328,9 @@ export default { */ setDate (timestamp) { const date = new Date(timestamp) + if (this.useUtc) { + date = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate())) + } this.selectedDate = date this.setPageDate(date) this.$emit('selected', date) From 306561f7247822f5c8b3d3e395e6d0a6b3e60e94 Mon Sep 17 00:00:00 2001 From: Ignacio Tampe Palma Date: Mon, 11 Feb 2019 13:09:55 -0300 Subject: [PATCH 2/4] Fixed mistake on trying to write const var --- src/components/Datepicker.vue | 305 ++++++++++++++++++---------------- 1 file changed, 158 insertions(+), 147 deletions(-) diff --git a/src/components/Datepicker.vue b/src/components/Datepicker.vue index 4fe43976..1ed6f8cf 100644 --- a/src/components/Datepicker.vue +++ b/src/components/Datepicker.vue @@ -25,11 +25,11 @@ @showCalendar="showCalendar" @closeCalendar="close" @typedDate="setTypedDate" - @clearDate="clearDate"> + @clearDate="clearDate" + > - + @selectedDisabled="selectDisabledDate" + > @@ -70,7 +71,8 @@ :use-utc="useUtc" @selectMonth="selectMonth" @showYearCalendar="showYearCalendar" - @changedYear="setPageDate"> + @changedYear="setPageDate" + > @@ -88,18 +90,19 @@ :isRtl="isRtl" :use-utc="useUtc" @selectYear="selectYear" - @changedDecade="setPageDate"> + @changedDecade="setPageDate" + > From 12e6b4b68a2fc447aa321c24f0ddbdf29643d319 Mon Sep 17 00:00:00 2001 From: Ignacio Tampe Palma Date: Mon, 11 Feb 2019 13:16:20 -0300 Subject: [PATCH 3/4] Fix again --- src/components/Datepicker.vue | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/Datepicker.vue b/src/components/Datepicker.vue index 1ed6f8cf..7a01ea17 100644 --- a/src/components/Datepicker.vue +++ b/src/components/Datepicker.vue @@ -336,13 +336,11 @@ export default { * @param {Number} timestamp */ setDate(timestamp) { + var date = new Date(timestamp); if (this.useUtc) { - const date = new Date( - Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()) - ); - } else { - const date = new Date(timestamp); - } + date = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()) + ); + this.selectedDate = date; this.setPageDate(date); this.$emit("selected", date); From 3463533c90f61ee5471e28ce516659366d2b63ff Mon Sep 17 00:00:00 2001 From: Ignacio Tampe Palma Date: Mon, 11 Feb 2019 13:18:36 -0300 Subject: [PATCH 4/4] Fix again --- src/components/Datepicker.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Datepicker.vue b/src/components/Datepicker.vue index 7a01ea17..0eaf0d99 100644 --- a/src/components/Datepicker.vue +++ b/src/components/Datepicker.vue @@ -338,8 +338,8 @@ export default { setDate(timestamp) { var date = new Date(timestamp); if (this.useUtc) { - date = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()) - ); + date = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate())) + } this.selectedDate = date; this.setPageDate(date);