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

fix subtitles in ms edge

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-09 19:05:29 -05:00
parent 71811cb9e3
commit 4f48507a2d
12 changed files with 231 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/scripts/connectlogin.js
View file

@ -271,8 +271,13 @@
$('#txtSignupPassword', page).val('');
$('#txtSignupPasswordConfirm', page).val('');
var link = '<a href="http://emby.media" target="_blank">http://emby.media</a>';
$('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessage', link));
if (browserInfo.safari && AppInfo.isNativeApp) {
// With apple we can't even have a link to the site
$('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessageWithoutLink'));
} else {
var link = '<a href="http://emby.media" target="_blank">http://emby.media</a>';
$('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessage', link));
}
}).on('pageshow', "#connectLoginPage", function () {

10
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -512,11 +512,9 @@
function enableNativeTrackSupport(track) {
if (browserInfo.safari) {
if (navigator.userAgent.toLowerCase().indexOf('os x') == -1) {
// Leave it to apple to have different behavior between safari on ios vs osx
return false;
}
if (browserInfo.safari && browserInfo.mobile) {
// Leave it to apple to have different behavior between safari on ios vs osx
return false;
}
if (browserInfo.firefox) {
@ -648,7 +646,7 @@
console.log('expectedId: ' + expectedId + '--currentTrack.Id:' + currentTrack.id);
// IE doesn't support track id
if (browserInfo.msie) {
if (browserInfo.msie || browserInfo.edge) {
if (trackIndex == i) {
mode = 1; // show this track
} else {