Skip to content

fix video autoplay && image styles #196

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix video autoplay && image styles #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/components/vueperslides/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
background-position: center;

&__image {background-position: center;}
&__video {outline: none;}
&__video {outline: none; width: 100%; height: 100%;}
&--no-pointer-events:before {
content: '';
position: absolute;
Expand Down
21 changes: 12 additions & 9 deletions src/components/vueperslides/vueperslide.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ component.vueperslide(
template(v-if="videoObj")
video.vueperslide__video(
v-if="videoObj.webm || videoObj.mp4"
width="100%"
height="100%"
v-bind="videoObj.props || {}")
source(v-if="videoObj.webm" :src="videoObj.webm" type="video/webm")
source(v-if="videoObj.mp4" :src="videoObj.mp4" type="video/mp4")
Expand Down Expand Up @@ -85,7 +83,7 @@ export default {
const { visibleSlides, fade, slideImageInside, gap, gapPx } = this.conf

return {
...(!slideImageInside && this.imageSrc && { backgroundImage: `url("${this.imageSrc}")` }),
...(!slideImageInside && this.imageSrc && { backgroundImage: `url("${this.imageSrc}")`, backgroundRepeat: 'no-repeat' }),
...(visibleSlides > 1 && { width: (100 - (gap ? gap * (visibleSlides - 1) : 0)) / visibleSlides + '%' }),
...(visibleSlides > 1 && fade && { [this.conf.rtl ? 'right' : 'left']: ((this.slideIndex % visibleSlides) / visibleSlides) * 100 + '%' }),
...(gap && { [this.conf.rtl ? 'marginLeft' : 'marginRight']: gap + (gapPx ? 'px' : '%') })
Expand All @@ -102,7 +100,10 @@ export default {
return /youtube\.|youtu\.be/.test(this.videoObj.url)
},
imageStyles () {
return { ...(this.conf.slideImageInside && this.imageSrc && { backgroundImage: `url("${this.imageSrc}")` }) }
if (!this.conf.slideImageInside || !this.imageSrc) {
return {}
}
return { backgroundImage: `url("${this.imageSrc}")`, backgroundRepeat: 'no-repeat' }
},
slideFace3d () {
if (!this.conf['3d']) return false
Expand Down Expand Up @@ -159,12 +160,14 @@ export default {

// Only for lazy loading, this method is called from the Vueperslides component.
loadImage () {
// Don't try to reload image if already loaded.
if (this.loading || this.loaded) return

this.loading = true

return new Promise((resolve, reject) => {
// Don't try to reload image if already loaded.
if (this.loading || this.loaded || !this.image?.length) {
this.loaded = true
return resolve(null)
}

this.loading = true
const img = document.createElement('img')
img.onload = () => {
this.imageSrc = this.image
Expand Down
8 changes: 4 additions & 4 deletions src/components/vueperslides/vueperslides.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,12 +971,10 @@ export default {
if (this.isReady && !jumping && emit) this.emit('before-slide', true, nextSlide)

// First pause all the videos.
// this.slides.list.forEach(slide => slide.video && slide.video.pause())
this.slides.list.forEach(slide => slide.video && slide.video.pause())

const nextSlideObj = this.slides.list[nextSlide]
if (this.isReady && nextSlideObj.video) {
const currSlideObj = this.slides.list[this.slides.current]
if (currSlideObj.video) currSlideObj.video.pause()
if (this.isReady && nextSlideObj?.video?.props?.autoplay) {
nextSlideObj.video.play()
}

Expand Down Expand Up @@ -1083,6 +1081,8 @@ export default {
loadSlide (slide, index) {
slide.loadImage()
.then(response => {
if (!response) return

const { image, style } = response
slide.loaded = true
slide.image = image
Expand Down