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

update dialogs

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-18 19:23:48 -04:00
parent 62e03ef0be
commit e156534cba
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/components/paperdialoghelper.js
View file

@ -55,6 +55,9 @@
if ($.browser.msie) { if ($.browser.msie) {
return false; return false;
} }
if ($.browser.edge) {
return false;
}
return true; return true;
} }

8
dashboard-ui/devices/ie/ie.js
View file

@ -6,15 +6,13 @@
var page = this; var page = this;
if (navigator.userAgent.toLowerCase().indexOf('Windows NT 10.') != -1) { if (navigator.userAgent.toLowerCase().indexOf('windows nt 10.') != -1) {
var expectedValue = new Date().toDateString(); var expectedValue = new Date().toDateString() + "1";
if (appStorage.getItem("ieswitchtoedge") == expectedValue) { if (appStorage.getItem("ieswitchtoedge") == expectedValue) {
return; return;
} }
appStorage.setItem("ieswitchtoedge", expectedValue);
var msg = Globalize.translate('MessageTryMicrosoftEdge'); var msg = Globalize.translate('MessageTryMicrosoftEdge');
msg += "<br/><br/>"; msg += "<br/><br/>";
@ -24,6 +22,8 @@
message: msg, message: msg,
title: Globalize.translate('HeaderTryMicrosoftEdge') title: Globalize.translate('HeaderTryMicrosoftEdge')
}); });
appStorage.setItem("ieswitchtoedge", expectedValue);
} }
} }

12
dashboard-ui/scripts/mediaplayer.js
View file

@ -147,7 +147,7 @@
}); });
} }
if ($.browser.chrome) { if ($.browser.chrome || $.browser.edge) {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: 'mkv,mov', Container: 'mkv,mov',
Type: 'Video', Type: 'Video',
@ -466,11 +466,11 @@
profile.ResponseProfiles = []; profile.ResponseProfiles = [];
//profile.ResponseProfiles.push({ profile.ResponseProfiles.push({
// Type: 'Video', Type: 'Video',
// Container: 'mkv', Container: 'mkv',
// MimeType: 'video/webm' MimeType: 'video/mp4'
//}); });
profile.ResponseProfiles.push({ profile.ResponseProfiles.push({
Type: 'Video', Type: 'Video',

6
dashboard-ui/scripts/site.js
View file

@ -4,7 +4,7 @@
crossDomain: true crossDomain: true
}); });
if ($.browser.msie) { if ($.browser.msie || $.browser.edge) {
// This is unfortunately required due to IE's over-aggressive caching. // This is unfortunately required due to IE's over-aggressive caching.
// https://github.com/MediaBrowser/MediaBrowser/issues/179 // https://github.com/MediaBrowser/MediaBrowser/issues/179
@ -504,7 +504,7 @@ var Dashboard = {
} else { } else {
// IE renders it incorrectly // IE renders it incorrectly
if (!$.browser.msie) { if (!$.browser.msie && !$.browser.edge) {
elem = document.createElement("paper-spinner"); elem = document.createElement("paper-spinner");
elem.classList.add('docspinner'); elem.classList.add('docspinner');
@ -2054,7 +2054,7 @@ var AppInfo = {};
var urlArgs = "v=" + window.dashboardVersion; var urlArgs = "v=" + window.dashboardVersion;
if ($.browser.msie) { if ($.browser.msie || $.browser.edge) {
urlArgs += new Date().getTime(); urlArgs += new Date().getTime();
} }