plyr: stop wrapping

Signed-off-by: Varun Patil <radialapps@gmail.com>
pull/900/head
Varun Patil 2023-10-27 01:46:19 -07:00
parent ee8693ce0b
commit 7283066721
5 changed files with 51 additions and 2 deletions

View File

@ -33,6 +33,7 @@ build-js-production:
patch-external:
patch -p1 -N < patches/scroller-perf.patch || true
patch -p1 -N < patches/scroller-sticky.patch || true
patch -p1 -N < patches/plyr-wrap.patch || true
watch-js:
npm run watch

View File

@ -0,0 +1,41 @@
--- ./node_modules/plyr/dist/plyr.mjs 2023-10-27 01:22:58.553986870 -0700
+++ ./node_modules/plyr/dist/plyr.mjs 2023-10-27 01:22:47.333523678 -0700
@@ -3024,6 +3024,8 @@
const captions = {
// Setup captions
setup() {
+ return; // disable due to bug in insertAftere (no element in wrapper)
+
// Requires UI support
if (!this.supported.ui) {
return;
@@ -6224,9 +6226,6 @@
class: this.config.classNames.video
});
- // Wrap the video in a container
- wrap(this.media, this.elements.wrapper);
-
// Poster image container
this.elements.poster = createElement('div', {
class: this.config.classNames.poster
@@ -7937,11 +7936,6 @@
return;
}
- // Cache original element state for .destroy()
- const clone = this.media.cloneNode(true);
- clone.autoplay = false;
- this.elements.original = clone;
-
// Set media type based on tag or data attribute
// Supported: video, audio, vimeo, youtube
const _type = this.media.tagName.toLowerCase();
@@ -8053,7 +8047,6 @@
// Wrap media
if (!is.element(this.elements.container)) {
this.elements.container = createElement('div');
- wrap(this.media, this.elements.container);
}
// Migrate custom properties from media to container (so they work 😉)

View File

@ -368,7 +368,12 @@ class VideoContentSetup {
}, 250);
// Restore original parent of video element
origParent.appendChild(content.videoElement);
if (content.videoElement.parentElement !== origParent) {
// Shouldn't happen when plyr-wrap.patch is applied
console.error('PsVideo: Video element parent was changed. Is plyr-wrap.patch applied?');
origParent.appendChild(content.videoElement);
}
// Move plyr to the slide container
content.slide?.holderElement?.appendChild(container);

View File

@ -3,7 +3,7 @@ _m.video.videojs = videojs;
import 'video.js/dist/video-js.min.css';
import Plyr from 'plyr';
import Plyr from 'plyr/dist/plyr.mjs';
_m.video.Plyr = Plyr;
import 'plyr/dist/plyr.css';

2
src/shims.d.ts vendored
View File

@ -13,3 +13,5 @@ declare module '@nextcloud/vue/dist/Components/*' {
}
declare module 'vue-virtual-scroller';
declare module 'plyr/dist/plyr.mjs';