Skip to content

Commit e2dec9e

Browse files
committed
Merge branch 'release/v2.9.1'
2 parents 6816fe9 + b7e13d7 commit e2dec9e

10 files changed

+9235
-21
lines changed

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ This project is licensed under the MIT License
129129

130130
## Change log
131131

132+
### 2.9.1 (2021-10-31)
133+
* Fixed: [Using jumpMinute and roundMinute together](https://github.com/talkhabi/vue-persian-datetime-picker/issues/182)
134+
132135
### 2.9.0 (2021-09-27)
133136
* Feat: [Added simple-mode](https://talkhabi.github.io/vue-persian-datetime-picker/#/simple-mode)
134137
* Feat: [Added `input-attrs`](https://github.com/talkhabi/vue-persian-datetime-picker/issues/170)

babel.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
presets: ['@vue/cli-plugin-babel/preset']
2+
presets: [['@vue/cli-plugin-babel/preset', { useBuiltIns: false }]]
33
}

dist/vue-persian-datetime-picker.common.js

+4,605
Large diffs are not rendered by default.

dist/vue-persian-datetime-picker.umd.js

+4,604
Large diffs are not rendered by default.

dist/vue-persian-datetime-picker.umd.min.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/VuePersianDatetimePicker.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -147,19 +147,19 @@
147147
@select-month="selectMonth"
148148
@select-day="selectDay"
149149
>
150-
<template v-slot:header-date="slotData">
150+
<template #header-date="slotData">
151151
<slot name="header-date" v-bind="slotData" />
152152
</template>
153-
<template v-slot:locales="slotData">
153+
<template #locales="slotData">
154154
<slot name="locales" v-bind="slotData" />
155155
</template>
156-
<template v-slot:year-item="slotData">
156+
<template #year-item="slotData">
157157
<slot name="year-item" v-bind="slotData" />
158158
</template>
159-
<template v-slot:month-item="slotData">
159+
<template #month-item="slotData">
160160
<slot name="month-item" v-bind="slotData" />
161161
</template>
162-
<template v-slot:day-item="slotData">
162+
<template #day-item="slotData">
163163
<slot name="day-item" v-bind="slotData" />
164164
</template>
165165
</simple-mode>

src/assets/scss/style.scss

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
@import 'variables';
22
@import 'transitions';
33

4+
.#{$prefix}main *,
5+
.#{$prefix}wrapper * {
6+
box-sizing: border-box;
7+
}
8+
49
.#{$prefix}clearfix {
510
&:after, &:before {
611
content: " ";
@@ -13,12 +18,11 @@
1318
}
1419

1520
.#{$prefix}input-group {
16-
display: table;
17-
width: 100%;
21+
display: flex;
1822
position: relative;
1923

2024
input {
21-
display: table-cell;
25+
flex-grow: 1;
2226
border: 1px solid #dadada;
2327
border-right: none;
2428
border-top-right-radius: 0;
@@ -67,15 +71,11 @@
6771
}
6872

6973
.#{$prefix}icon-btn {
70-
display: table-cell;
71-
width: 1%;
7274
cursor: pointer;
7375
padding: 0 10px;
74-
vertical-align: middle;
75-
76-
> svg {
77-
vertical-align: middle;
78-
}
76+
display: flex;
77+
justify-content: center;
78+
align-items: center;
7979
}
8080

8181
.#{$prefix}wrapper {

src/components/simple/SimpleMode.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export default {
144144
monthDays: { type: Array, default: () => [] },
145145
selectedDates: { type: Array, default: () => [] },
146146
formattedDate: { type: String, default: null },
147-
hoveredItem: { type: Object, default: null },
147+
hoveredItem: { type: Date, default: null },
148148
locales: { type: Array, default: () => [] },
149149
core: { type: Object, default: null },
150150
setLocale: { type: Function, default: null },

src/components/time/TimeColumn.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export default {
103103
},
104104
methods: {
105105
update(value) {
106-
this.selfValue = this.selfValue * 1 + value * this.jump
106+
this.selfValue = +this.selfValue + value * this.jump
107107
108108
let now = new Date().getTime(),
109109
def = now - this.lastUpdate

src/components/time/TimeSection.vue

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
<div :class="['vpd-addon-list vpd-time', { 'vpd-disabled': isDisableTime }]">
33
<div class="vpd-addon-list-content">
44
<time-column
5-
ref="minute"
5+
ref="hour"
66
v-model="hourModel"
77
class="vpd-time-h"
88
:attributes="timeAttributes"
99
:formatter="convertToLocaleNumber"
1010
@filled="focusNext"
1111
/>
1212
<time-column
13-
ref="hour"
13+
ref="minute"
1414
v-model="minuteModel"
1515
class="vpd-time-m"
16+
:jump="jumpMinute"
1617
:attributes="timeAttributes"
1718
:formatter="convertToLocaleNumber"
1819
/>
@@ -101,7 +102,7 @@ export default {
101102
this.$emit('update:time', time)
102103
},
103104
focusNext() {
104-
this.$refs.hour.$el.querySelector('input').focus()
105+
this.$refs.minute.$el.querySelector('input').focus()
105106
}
106107
}
107108
}

0 commit comments

Comments
 (0)