milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into connection-manager-global

Browse source
This commit is contained in:
Julien Machiels 2020-09-01 10:16:21 +02:00 • committed by GitHub
commit 3cbe0f7264
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
139 changed files with 1032 additions and 3566 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -392,10 +392,7 @@ function tryRemoveElement(elem) {
return new Promise((resolve, reject) => {
requireHlsPlayer(() => {
const hls = new Hls({
manifestLoadingTimeOut: 20000,
xhrSetup(xhr) {
xhr.withCredentials = true;
}
manifestLoadingTimeOut: 20000
});
hls.loadSource(url);
hls.attachMedia(elem);
@ -1392,7 +1389,12 @@ function tryRemoveElement(elem) {
const list = [];
const video = document.createElement('video');
if (video.webkitSupportsPresentationMode && typeof video.webkitSetPresentationMode === 'function' || document.pictureInPictureEnabled) {
if (
// Check non-standard Safari PiP support
typeof video.webkitSupportsPresentationMode === 'function' && video.webkitSupportsPresentationMode('picture-in-picture') && typeof video.webkitSetPresentationMode === 'function'
// Check standard PiP support
|| document.pictureInPictureEnabled
) {
list.push('PictureInPicture');
} else if (window.Windows) {
if (Windows.UI.ViewManagement.ApplicationView.getForCurrentView().isViewModeSupported(Windows.UI.ViewManagement.ApplicationViewMode.compactOverlay)) {