Skip to content

Commit 15b9938

Browse files
author
hoanguyen
committed
Reslove conflict
2 parents f2b5c35 + 583e413 commit 15b9938

File tree

6 files changed

+23
-18
lines changed

6 files changed

+23
-18
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ export default {
105105
## Events
106106
| Event | Type | Emitter | Description |
107107
|:--------------------------|:--------|:---------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
108-
| `navigation-click` | | Carousel | Emits when the a navigation button is clicked, with the current direction (`backward` or `forward`) |
109-
| `pagination-click` | | Carousel | Emits when a pagination button is clicked, with the current `pageNumber` |
108+
| `navigation-click` | | Carousel | Emits when the a navigation button is clicked, with the current direction (`backward` or `forward`) |
109+
| `pagination-click` | | Carousel | Emits when a pagination button is clicked, with the current `pageNumber` |
110110
| `page-change` | Number | Carousel | Emits with the current page number. |
111111
| `slide-click` | Object | Slide | Emits with the *dataset* object of the selected element ··
112112
| `transition-start` | | Carousel | Emits when the transition end is reached |

dist/assets/index.46489582.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/assets/index.d2c9bee6.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<title>Vue Concise Carousel is SSR and CSR friendly</title>
7-
<script type="module" crossorigin src="/assets/index.46489582.js"></script>
7+
<script type="module" crossorigin src="/assets/index.d2c9bee6.js"></script>
88
<link rel="modulepreload" href="/assets/vendor.e49d05b8.js">
99
<link rel="stylesheet" href="/assets/index.38e53d8b.css">
1010
</head>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jambonn/vue-concise-carousel",
3-
"version": "2.1.6",
3+
"version": "2.1.10",
44
"description": "Vue Concise Carousel is SSR and CSR friendly",
55
"keywords": [
66
"vue",

src/Carousel.vue

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -652,12 +652,14 @@ export default {
652652
* @return {Number} Width of the carousel in pixels
653653
*/
654654
const getCarouselWidth = () => {
655-
const carouselInnerElements = vueConciseCarousel.value.getElementsByClassName(
656-
'VueCarousel-inner',
657-
)
658-
for (let i = 0; i < carouselInnerElements.length; i++) {
659-
if (carouselInnerElements[i].clientWidth > 0) {
660-
carouselWidth.value = carouselInnerElements[i].clientWidth || 0
655+
if (vueConciseCarousel.value) {
656+
const carouselInnerElements = vueConciseCarousel.value.getElementsByClassName(
657+
'VueCarousel-inner',
658+
)
659+
for (let i = 0; i < carouselInnerElements.length; i++) {
660+
if (carouselInnerElements[i].clientWidth > 0) {
661+
carouselWidth.value = carouselInnerElements[i].clientWidth || 0
662+
}
661663
}
662664
}
663665
return carouselWidth.value
@@ -688,11 +690,13 @@ export default {
688690
* @return {Number} The number of slides
689691
*/
690692
const getSlideCount = () => {
691-
const carouselInnerElements = vueConciseCarousel.value.getElementsByClassName(
692-
'VueCarousel-slide',
693-
)
694-
slotSlides.value = carouselInnerElements
695-
slideCount.value = carouselInnerElements.length
693+
if (vueConciseCarousel.value) {
694+
const carouselInnerElements = vueConciseCarousel.value.getElementsByClassName(
695+
'VueCarousel-slide',
696+
)
697+
slotSlides.value = carouselInnerElements
698+
slideCount.value = carouselInnerElements.length
699+
}
696700
}
697701
/**
698702
* Gets the slide at the specified index
@@ -995,7 +999,7 @@ export default {
995999
}
9961000
9971001
if (props.keyboard) {
998-
document.addEventListener('keydown', keyboardEventHandler, {
1002+
window.addEventListener('keydown', keyboardEventHandler, {
9991003
passive: true,
10001004
})
10011005
}
@@ -1057,7 +1061,7 @@ export default {
10571061
}
10581062
10591063
if (props.keyboard) {
1060-
document.removeEventListener('keydown', keyboardEventHandler)
1064+
window.removeEventListener('keydown', keyboardEventHandler)
10611065
}
10621066
}
10631067
@@ -1093,6 +1097,7 @@ export default {
10931097
isNavigationRequired,
10941098
pageCount,
10951099
slideCount,
1100+
currentPerPage,
10961101
currentPage,
10971102
canAdvanceForward,
10981103
canAdvanceBackward,

0 commit comments

Comments
 (0)