Skip to content

fix(b-carousel): transition when controls are inside slides (closes #5361) #5462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 13, 2020
Merged

fix(b-carousel): transition when controls are inside slides (closes #5361) #5462

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a020776
first attempt
Hiws Jun 2, 2020
17eac87
Merge branch 'dev' into fix-broken-carousel-transition
Hiws Jun 2, 2020
ef6ea24
Merge branch 'dev' into fix-broken-carousel-transition
jacobmllr95 Jun 4, 2020
4540a11
Merge branch 'dev' into fix-broken-carousel-transition
jacobmllr95 Jun 4, 2020
d1e741b
Merge branch 'dev' into fix-broken-carousel-transition
jacobmllr95 Jun 4, 2020
162c523
Merge branch 'dev' into fix-broken-carousel-transition
jacobmllr95 Jun 7, 2020
2a189a9
Merge branch 'dev' into fix-broken-carousel-transition
Hiws Jun 12, 2020
ffc9a01
Merge branch 'dev' into fix-broken-carousel-transition
jacobmllr95 Jun 13, 2020
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
8 changes: 2 additions & 6 deletions src/components/carousel/carousel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,7 @@ export const BCarousel = /*#__PURE__*/ Vue.extend({
/* istanbul ignore if: transition events cant be tested in JSDOM */
if (this.transitionEndEvent) {
const events = this.transitionEndEvent.split(/\s+/)
events.forEach(evt =>
eventOff(currentSlide, evt, onceTransEnd, EVENT_OPTIONS_NO_CAPTURE)
)
events.forEach(evt => eventOff(nextSlide, evt, onceTransEnd, EVENT_OPTIONS_NO_CAPTURE))
}
this.clearAnimationTimeout()
removeClass(nextSlide, dirClass)
Expand All @@ -394,9 +392,7 @@ export const BCarousel = /*#__PURE__*/ Vue.extend({
/* istanbul ignore if: transition events cant be tested in JSDOM */
if (this.transitionEndEvent) {
const events = this.transitionEndEvent.split(/\s+/)
events.forEach(event =>
eventOn(currentSlide, event, onceTransEnd, EVENT_OPTIONS_NO_CAPTURE)
)
events.forEach(event => eventOn(nextSlide, event, onceTransEnd, EVENT_OPTIONS_NO_CAPTURE))
}
// Fallback to setTimeout()
this.$_animationTimeout = setTimeout(onceTransEnd, TRANS_DURATION)
Expand Down