cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

update alerts

Browse Source
This commit is contained in:
Luke Pulverenti 2016-05-25 14:59:46 -04:00
parent e9cd78f796
commit 7016a4c624
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dashboard-ui/scripts/site.js
View File

@ -1223,7 +1223,7 @@ var Dashboard = {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm", Container: "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm",
Type: 'Video', Type: 'Video',
AudioCodec: 'aac,aac_latm,mp3,ac3,wma,dca,pcm,PCM_S16LE,PCM_S24LE,opus,flac' AudioCodec: 'aac,aac_latm,mp2,mp3,ac3,wma,dca,pcm,PCM_S16LE,PCM_S24LE,opus,flac'
}); });
profile.CodecProfiles = profile.CodecProfiles.filter(function (i) { profile.CodecProfiles = profile.CodecProfiles.filter(function (i) {
@ -2096,17 +2096,27 @@ var AppInfo = {};
var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents'; var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents';
if (browser.mobile) { var preferNativeAlerts = browser.mobile || browser.tv || browser.xboxOne;
define("prompt", [embyWebComponentsBowerPath + "/prompt/nativeprompt"], returnFirstDependency); // use native alerts if preferred and supported (not supported in opera tv)
define("confirm", [embyWebComponentsBowerPath + "/confirm/nativeconfirm"], returnFirstDependency); if (preferNativeAlerts && globalScope.alert) {
define("alert", [embyWebComponentsBowerPath + "/alert/nativealert"], returnFirstDependency); define("alert", [embyWebComponentsBowerPath + "/alert/nativealert"], returnFirstDependency);
} else { } else {
define("prompt", [embyWebComponentsBowerPath + "/prompt/prompt"], returnFirstDependency);
define("confirm", [embyWebComponentsBowerPath + "/confirm/confirm"], returnFirstDependency);
define("alert", [embyWebComponentsBowerPath + "/alert/alert"], returnFirstDependency); define("alert", [embyWebComponentsBowerPath + "/alert/alert"], returnFirstDependency);
} }
if (browser.tv) { if (preferNativeAlerts && globalScope.confirm) {
define("confirm", [embyWebComponentsBowerPath + "/confirm/nativeconfirm"], returnFirstDependency);
} else {
define("confirm", [embyWebComponentsBowerPath + "/confirm/confirm"], returnFirstDependency);
}
if (preferNativeAlerts && globalScope.prompt) {
define("prompt", [embyWebComponentsBowerPath + "/prompt/nativeprompt"], returnFirstDependency);
} else {
define("prompt", [embyWebComponentsBowerPath + "/prompt/prompt"], returnFirstDependency);
}
if (browser.tv && !browser.animate) {
define("loading", [embyWebComponentsBowerPath + "/loading/loading-smarttv"], returnFirstDependency); define("loading", [embyWebComponentsBowerPath + "/loading/loading-smarttv"], returnFirstDependency);
} else { } else {
define("loading", [embyWebComponentsBowerPath + "/loading/loading-lite"], returnFirstDependency); define("loading", [embyWebComponentsBowerPath + "/loading/loading-lite"], returnFirstDependency);