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 branch 'release-10.8.z' into additionalPluginVerification

Browse source
This commit is contained in:
Joshua M. Boniface 2023-06-28 23:01:40 -04:00 • committed by GitHub
commit 59813ee0ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/directorybrowser/directorybrowser.js
View file

@ -43,7 +43,7 @@ function refreshDirectoryBrowser(page, path, fileOptions, updatePathOnError) {
Promise.all(promises).then( Promise.all(promises).then(
responses => { responses => {
const folders = responses[0]; const folders = responses[0];
const parentPath = responses[1] || ''; const parentPath = (responses[1] ? JSON.parse(responses[1]) : '') || '';
let html = ''; let html = '';
page.querySelector('.results').scrollTop = 0; page.querySelector('.results').scrollTop = 0;

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

@ -1,3 +1,5 @@
import DOMPurify from 'dompurify';
import browser from '../../scripts/browser'; import browser from '../../scripts/browser';
import { Events } from 'jellyfin-apiclient'; import { Events } from 'jellyfin-apiclient';
import { appHost } from '../../components/apphost'; import { appHost } from '../../components/apphost';
@ -1317,7 +1319,8 @@ function tryRemoveElement(elem) {
} }
if (selectedTrackEvent && selectedTrackEvent.Text) { if (selectedTrackEvent && selectedTrackEvent.Text) {
subtitleTextElement.innerHTML = normalizeTrackEventText(selectedTrackEvent.Text, true); subtitleTextElement.innerHTML = DOMPurify.sanitize(
normalizeTrackEventText(selectedTrackEvent.Text, true));
subtitleTextElement.classList.remove('hide'); subtitleTextElement.classList.remove('hide');
} else { } else {
subtitleTextElement.classList.add('hide'); subtitleTextElement.classList.add('hide');

2
src/scripts/browserDeviceProfile.js
View file

@ -130,7 +130,7 @@ import browser from './browser';
typeString = 'audio/ogg; codecs="opus"'; typeString = 'audio/ogg; codecs="opus"';
} else if (format === 'alac') { } else if (format === 'alac') {
if (browser.iOS || browser.osx) { if (browser.iOS || browser.osx && browser.safari) {
return true; return true;
} }
} else if (format === 'mp2') { } else if (format === 'mp2') {