mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #3466 from dmitrylyzo/fix-play-nopromise

Browse source 
Fix HTMLMediaElement.play no Promise
This commit is contained in:
Bill Thornton 2022-02-28 10:06:39 -05:00 • committed by GitHub
commit 188dcf820e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/components/htmlMediaHelper.js
View file

@ -197,29 +197,21 @@ import { Events } from 'jellyfin-apiclient';
export function playWithPromise(elem, onErrorFn) {
try {
const promise = elem.play();
if (promise && promise.then) {
// Chrome now returns a promise
return promise
.then(() => {
onSuccessfulPlay(elem, onErrorFn);
return elem.play()
.catch((e) => {
const errorName = (e.name || '').toLowerCase();
// safari uses aborterror
if (errorName === 'notallowederror' ||
errorName === 'aborterror') {
// swallow this error because the user can still click the play button on the video element
return Promise.resolve();
})
.catch((e) => {
const errorName = (e.name || '').toLowerCase();
// safari uses aborterror
if (errorName === 'notallowederror' ||
errorName === 'aborterror') {
// swallow this error because the user can still click the play button on the video element
onSuccessfulPlay(elem, onErrorFn);
return Promise.resolve();
}
return Promise.reject();
});
} else {
onSuccessfulPlay(elem, onErrorFn);
return Promise.resolve();
}
}
return Promise.reject();
})
.then(() => {
onSuccessfulPlay(elem, onErrorFn);
return Promise.resolve();
});
} catch (err) {
console.error('error calling video.play: ' + err);
return Promise.reject();

12
src/components/syncPlay/ui/playbackPermissionManager.js
View file

@ -39,16 +39,12 @@ class PlaybackPermissionManager {
return Promise.resolve(true);
}
return new Promise((resolve, reject) => {
const media = createTestMediaElement();
media.play().then(() => {
resolve();
}).catch((error) => {
reject(error);
}).finally(() => {
const media = createTestMediaElement();
return media.play()
.finally(() => {
destroyTestMediaElement(media);
});
});
}
}

26
src/legacy/htmlMediaElement.js Normal file
View file

@ -0,0 +1,26 @@
/**
* Polyfill for HTMLMediaElement
* - HTMLMediaElement.play
* Return a `Promise`.
*/
(function (HTMLMediaElement) {
'use strict';
const HTMLMediaElement_proto = HTMLMediaElement.prototype;
const real_play = HTMLMediaElement_proto.play;
HTMLMediaElement_proto.play = function () {
try {
const promise = real_play.apply(this, arguments);
if (typeof promise?.then === 'function') {
return promise;
}
return Promise.resolve();
} catch (err) {
return Promise.reject(err);
}
};
}(HTMLMediaElement));

1
src/scripts/site.js
View file

@ -31,6 +31,7 @@ import './serverNotifications';
import '../components/playback/playerSelectionMenu';
import '../legacy/domParserTextHtml';
import '../legacy/focusPreventScroll';
import '../legacy/htmlMediaElement';
import '../legacy/vendorStyles';
import SyncPlay from '../components/syncPlay/core';
import { playbackManager } from '../components/playback/playbackmanager';