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

added clear button #187

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Datetime.vue
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@
:max-datetime="popupMaxDatetime"
@confirm="confirm"
@cancel="cancel"
@clear="clear"
:auto="auto"
:week-start="weekStart"
:flow="flow"
@@ -94,6 +95,7 @@ export default {
type: Object,
default () {
return {
clear: 'Clear',
cancel: 'Cancel',
ok: 'Ok'
}
@@ -217,6 +219,11 @@ export default {
cancel () {
this.close()
},
clear () {
this.datetime = null
this.emitInput()
this.close()
},
newPopupDatetime () {
let datetime = DateTime.utc().setZone(this.zone).set({ seconds: 0, milliseconds: 0 })

7 changes: 7 additions & 0 deletions src/DatetimePopup.vue
Original file line number Diff line number Diff line change
@@ -41,6 +41,9 @@
:max-time="maxTime"></datetime-time-picker>
</div>
<div class="vdatetime-popup__actions">
<div class="vdatetime-popup__actions__button vdatetime-popup__actions__button--cancel" @click="clear">
<slot name="button-clear__internal" v-bind:step="step">{{ phrases.clear }}</slot>
</div>
<div class="vdatetime-popup__actions__button vdatetime-popup__actions__button--cancel" @click="cancel">
<slot name="button-cancel__internal" v-bind:step="step">{{ phrases.cancel }}</slot>
</div>
@@ -80,6 +83,7 @@ export default {
type: Object,
default () {
return {
clear: 'Clear',
cancel: 'Cancel',
ok: 'Ok'
}
@@ -209,6 +213,9 @@ export default {
cancel () {
this.$emit('cancel')
},
clear () {
this.$emit('clear')
},
onChangeYear (year) {
this.newDatetime = this.newDatetime.set({ year })

5 changes: 3 additions & 2 deletions test/specs/DatetimePopup.spec.js
Original file line number Diff line number Diff line change
@@ -68,8 +68,9 @@ describe('DatetimePopup.vue', function () {
})

expect(vm.$('.vdatetime-popup__actions')).to.exist
expect(vm.$$('.vdatetime-popup__actions__button')[0]).to.have.text('Cancel')
expect(vm.$$('.vdatetime-popup__actions__button')[1]).to.have.text('Ok')
expect(vm.$$('.vdatetime-popup__actions__button')[0]).to.have.text('Clear')
expect(vm.$$('.vdatetime-popup__actions__button')[1]).to.have.text('Cancel')
expect(vm.$$('.vdatetime-popup__actions__button')[2]).to.have.text('Ok')
})

it('should render the action buttons with custom slots', function () {