Skip to content

Commit

Permalink
Merge pull request #1679 from nextcloud/backport/1636/stable25
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Jun 2, 2023
2 parents f810e0b + 17e699c commit e1482d2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
Binary file added img/blank.mp4
Binary file not shown.
4 changes: 2 additions & 2 deletions js/viewer-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-main.js.map

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/components/Videos.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ import Vue from 'vue'
import VuePlyr from '@skjnldsv/vue-plyr'
import '@skjnldsv/vue-plyr/dist/vue-plyr.css'
import logger from '../services/logger.js'
import { imagePath } from '@nextcloud/router'

const liveExt = ['jpg', 'jpeg', 'png']
const liveExtRegex = new RegExp(`\\.(${liveExt.join('|')})$`, 'i')
const blankVideo = imagePath('viewer', 'blank.mp4')

Vue.use(VuePlyr)

Expand All @@ -85,7 +87,7 @@ export default {
return {
autoplay: this.active === true,
// Used to reset the video streams https://github.com/sampotts/plyr#javascript-1
blankVideo: 'blank.mp4',
blankVideo,
controls: ['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'fullscreen'],
loadSprite: false,
}
Expand Down

0 comments on commit e1482d2

Please sign in to comment.