1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge branch 'master' into synchronize-subtitles

This commit is contained in:
redSpoutnik 2019-04-30 20:58:51 +02:00 committed by GitHub
commit 4d8ec5b466
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 2914 additions and 870 deletions

View file

@ -993,11 +993,11 @@ var AppInfo = {};
}
if ("nextup" === item) {
return "list/list.html?type=nextup&serverId=" + options.serverId;
return "list.html?type=nextup&serverId=" + options.serverId;
}
if ("list" === item) {
var url = "list/list.html?serverId=" + options.serverId + "&type=" + options.itemTypes;
var url = "list.html?serverId=" + options.serverId + "&type=" + options.itemTypes;
if (options.isFavorite) {
url += "&IsFavorite=true";
@ -1012,27 +1012,27 @@ var AppInfo = {};
}
if ("movies" === options.section) {
return "list/list.html?type=Programs&IsMovie=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsMovie=true&serverId=" + options.serverId;
}
if ("shows" === options.section) {
return "list/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=" + options.serverId;
return "list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=" + options.serverId;
}
if ("sports" === options.section) {
return "list/list.html?type=Programs&IsSports=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsSports=true&serverId=" + options.serverId;
}
if ("kids" === options.section) {
return "list/list.html?type=Programs&IsKids=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsKids=true&serverId=" + options.serverId;
}
if ("news" === options.section) {
return "list/list.html?type=Programs&IsNews=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsNews=true&serverId=" + options.serverId;
}
if ("onnow" === options.section) {
return "list/list.html?type=Programs&IsAiring=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsAiring=true&serverId=" + options.serverId;
}
if ("dvrschedule" === options.section) {
@ -1051,7 +1051,7 @@ var AppInfo = {};
}
if ("Genre" === item.Type) {
url = "list/list.html?genreId=" + item.Id + "&serverId=" + serverId;
url = "list.html?genreId=" + item.Id + "&serverId=" + serverId;
if ("livetv" === context) {
url += "&type=Programs";
@ -1065,7 +1065,7 @@ var AppInfo = {};
}
if ("MusicGenre" === item.Type) {
url = "list/list.html?musicGenreId=" + item.Id + "&serverId=" + serverId;
url = "list.html?musicGenreId=" + item.Id + "&serverId=" + serverId;
if (options.parentId) {
url += "&parentId=" + options.parentId;
@ -1075,7 +1075,7 @@ var AppInfo = {};
}
if ("Studio" === item.Type) {
url = "list/list.html?studioId=" + item.Id + "&serverId=" + serverId;
url = "list.html?studioId=" + item.Id + "&serverId=" + serverId;
if (options.parentId) {
url += "&parentId=" + options.parentId;
@ -1124,7 +1124,7 @@ var AppInfo = {};
if (item.IsFolder) {
if (id) {
return "list/list.html?parentId=" + id + "&serverId=" + serverId;
return "list.html?parentId=" + id + "&serverId=" + serverId;
}
return "#";