mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #6080 from dmitrylyzo/discard-chrome-safari
Discard `chrome` and `safari` on Tizen and webOS
This commit is contained in:
commit
610cbdcee9
2 changed files with 9 additions and 4 deletions
|
@ -293,12 +293,17 @@ browser.edgeUwp = browser.edge && (userAgent.toLowerCase().indexOf('msapphost')
|
|||
|
||||
if (browser.web0s) {
|
||||
browser.web0sVersion = web0sVersion(browser);
|
||||
} else if (browser.tizen) {
|
||||
// UserAgent string contains 'Safari' and 'safari' is set by matched browser, but we only want 'tizen' to be true
|
||||
delete browser.safari;
|
||||
|
||||
// UserAgent string contains 'Chrome' and 'Safari', but we only want 'web0s' to be true
|
||||
delete browser.chrome;
|
||||
delete browser.safari;
|
||||
} else if (browser.tizen) {
|
||||
const v = (navigator.appVersion).match(/Tizen (\d+).(\d+)/);
|
||||
browser.tizenVersion = parseInt(v[1], 10);
|
||||
|
||||
// UserAgent string contains 'Chrome' and 'Safari', but we only want 'tizen' to be true
|
||||
delete browser.chrome;
|
||||
delete browser.safari;
|
||||
} else {
|
||||
browser.orsay = userAgent.toLowerCase().indexOf('smarthub') !== -1;
|
||||
}
|
||||
|
|
|
@ -142,7 +142,7 @@ export class UserSettings {
|
|||
}
|
||||
|
||||
// Enable it by default only for the platforms that play fMP4 for sure.
|
||||
return toBoolean(this.get('preferFmp4HlsContainer', false), browser.safari || browser.firefox || (browser.chrome && !browser.web0s && !browser.tizen) || browser.edgeChromium);
|
||||
return toBoolean(this.get('preferFmp4HlsContainer', false), browser.safari || browser.firefox || browser.chrome || browser.edgeChromium);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue