Skip to content

Commit ad6e9e8

Browse files
committed
Latest changes day & calendar fixes
1 parent 3455d5e commit ad6e9e8

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"name": "vue-functional-calendar",
88
"description": "Lightweight, high-performance calendar component based on Vue.js",
9-
"version": "2.9.0",
9+
"version": "2.9.1",
1010
"license": "MIT",
1111
"repository": {
1212
"type": "git",

src/components/Day.vue

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,11 @@ export default {
146146
let endPos = this.calendar.multipleDateRange
147147
.map(range => range.end)
148148
.indexOf(this.day.date)
149-
if (
150-
~endPos ||
149+
150+
return !!(~endPos ||
151151
~this.calendar.multipleDateRange
152152
.map(range => range.start)
153-
.indexOf(this.day.date)
154-
) {
155-
return true
156-
}
157-
return false
153+
.indexOf(this.day.date));
158154
},
159155
timesShow() {
160156
let res = this.calendar.multipleDateRange
@@ -178,6 +174,7 @@ export default {
178174
.map(range => range.start)
179175
.lastIndexOf(this.day.date)
180176
177+
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
181178
this.toolTip =
182179
endPosFirst !== endPosLast ||
183180
startPosFirst !== startPosLast ||
@@ -188,7 +185,7 @@ export default {
188185
return '·'
189186
}
190187
191-
return (endPosFirst > -1 ? new Number(endPosFirst) : 0) || startPosFirst
188+
return (endPosFirst > -1 ? Number(endPosFirst) : 0) || startPosFirst
192189
}
193190
},
194191
methods: {

src/components/FunctionalCalendar.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,6 +1475,8 @@ export default {
14751475
currentCalendar.date = new Date(date.getFullYear(), key + 1, 0)
14761476
currentCalendar.key += hUniqueID()
14771477
}
1478+
1479+
let currentCalendar = this.listCalendars[calendarKey]
14781480
this.$emit('changedMonth', currentCalendar.date);
14791481
this.updateCalendar()
14801482
},

0 commit comments

Comments
 (0)