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 master into assets

Browse source
This commit is contained in:
dkanada 2020-01-08 11:10:24 +09:00
commit 2f4cf8248b
124 changed files with 5363 additions and 2283 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/scripts/imagehelper.js
View file

@ -3,26 +3,31 @@ define(["browser"], function (browser) {
function getDeviceIcon(device) {
var baseUrl = "assets/img/devices/";
switch (device) {
case "Opera":
case "Opera TV":
return baseUrl + "opera.svg";
switch (device.AppName) {
case "Samsung Smart TV":
return baseUrl + "samsung.svg";
case "Xbox One":
return baseUrl + "xbox.svg";
case "Sony PS4":
return baseUrl + "playstation.svg";
case "Chrome":
return baseUrl + "chrome.svg";
case "Firefox":
return baseUrl + "firefox.svg";
case "Edge":
return baseUrl + "edge.svg";
case "Internet Explorer":
return baseUrl + "msie.svg";
case "Web Browser":
return baseUrl + "html5.svg";
case "Kodi":
return baseUrl + "kodi.svg";
case "Jellyfin Web":
switch (device.Name) {
case "Opera":
case "Opera TV":
return baseUrl + "opera.svg";
case "Chrome":
return baseUrl + "chrome.svg";
case "Firefox":
return baseUrl + "firefox.svg";
case "Edge":
return baseUrl + "edge.svg";
case "Internet Explorer":
return baseUrl + "msie.svg";
default:
return baseUrl + "html5.svg";
}
default:
return baseUrl + "other.svg";
}
@ -61,4 +66,4 @@ define(["browser"], function (browser) {
getDeviceIcon: getDeviceIcon,
getLibraryIcon: getLibraryIcon
};
});
});

9
src/scripts/site.js
View file

@ -532,7 +532,9 @@ var AppInfo = {};
"components/htmlaudioplayer/plugin",
"components/htmlvideoplayer/plugin",
"components/photoplayer/plugin",
"components/youtubeplayer/plugin"
"components/youtubeplayer/plugin",
"components/backdropscreensaver/plugin",
"components/logoscreensaver/plugin"
];
if (appHost.supports("remotecontrol")) {
@ -594,6 +596,8 @@ var AppInfo = {};
require(["playerSelectionMenu", "components/playback/remotecontrolautoplay"]);
}
require(["components/screensavermanager"]);
if (!appHost.supports("physicalvolumecontrol") || browser.touch) {
require(["components/playback/volumeosd"]);
}
@ -671,7 +675,8 @@ var AppInfo = {};
autoPlayDetect: componentsPath + "/playback/autoplaydetect",
nowPlayingHelper: componentsPath + "/playback/nowplayinghelper",
pluginManager: componentsPath + "/pluginManager",
packageManager: componentsPath + "/packagemanager"
packageManager: componentsPath + "/packagemanager",
screensaverManager: componentsPath + "/screensavermanager"
};
requirejs.onError = onRequireJsError;