Skip to content
This repository has been archived by the owner on Jan 7, 2022. It is now read-only.

year value from Settings.defaultOuputCalendar #188

Open
wants to merge 2 commits into
base: v1.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/DatetimePopup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="vdatetime-popup">
<div class="vdatetime-popup__header">
<div class="vdatetime-popup__title" v-if="title">{{ title }}</div>
<div class="vdatetime-popup__year" @click="showYear" v-if="type !== 'time'">{{ year }}</div>
<div class="vdatetime-popup__year" @click="showYear" v-if="type !== 'time'">{{ yearLocal }}</div>
<div class="vdatetime-popup__date" @click="showMonth" v-if="type !== 'time'">{{ dateFormatted }}</div>
</div>
<div class="vdatetime-popup__body">
Expand Down Expand Up @@ -52,7 +52,7 @@
</template>

<script>
import { DateTime } from 'luxon'
import { DateTime, Settings } from 'luxon'
import { createFlowManager, createFlowManagerFromType } from './util'
import DatetimeCalendar from './DatetimeCalendar'
import DatetimeTimePicker from './DatetimeTimePicker'
Expand Down Expand Up @@ -150,6 +150,12 @@ export default {
year () {
return this.newDatetime.year
},
yearLocal () {
const yearString = this.newDatetime
.reconfigure({ outputCalendar: Settings.defaultOuputCalendar })
.toFormat('yyyy')
return parseInt(yearString)
},
month () {
return this.newDatetime.month
},
Expand Down
12 changes: 10 additions & 2 deletions src/DatetimeYearPicker.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<template>
<div class="vdatetime-year-picker">
<div class="vdatetime-year-picker__list vdatetime-year-picker__list" ref="yearList">
<div class="vdatetime-year-picker__item" v-for="year in years" @click="select(year)" :class="{'vdatetime-year-picker__item--selected': year.selected, 'vdatetime-year-picker__item--disabled': year.disabled}">{{ year.number }}
<div class="vdatetime-year-picker__item" v-for="year in years" @click="select(year)" :class="{'vdatetime-year-picker__item--selected': year.selected, 'vdatetime-year-picker__item--disabled': year.disabled}">{{ yearLocal(year.number) }}
</div>
</div>
</div>
</template>

<script>
import { DateTime } from 'luxon'
import { DateTime, Settings } from 'luxon'
import { yearIsDisabled, years } from './util'

export default {
Expand Down Expand Up @@ -51,6 +51,14 @@ export default {
const selectedYear = this.$refs.yearList.querySelector('.vdatetime-year-picker__item--selected')
this.$refs.yearList.scrollTop = selectedYear ? selectedYear.offsetTop - 250 : 0
}
},

yearLocal (year) {
const current = DateTime.fromFormat(year.toString(), 'yyyy')
const yearString = current
.reconfigure({ outputCalendar: Settings.defaultOuputCalendar })
.toFormat('yyyy')
return parseInt(yearString)
}
},

Expand Down