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

fixes #791 - Support server-side playlists

Browse source
This commit is contained in:
Luke Pulverenti 2014-08-02 22:16:37 -04:00
parent cd1e583fa7
commit ba247c8a15
33 changed files with 1131 additions and 716 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -347,14 +347,10 @@
var firstItem = items[0];
var promise;
if (firstItem.IsFolder) {
if (firstItem.Type == "Playlist") {
promise = self.getItemsForPlayback({
ParentId: firstItem.Id,
Filters: "IsNotFolder",
Recursive: true,
SortBy: "SortName",
MediaTypes: "Audio,Video"
});
}
else if (firstItem.Type == "MusicArtist") {
@ -378,6 +374,16 @@
MediaTypes: "Audio"
});
}
else if (firstItem.IsFolder) {
promise = self.getItemsForPlayback({
ParentId: firstItem.Id,
Filters: "IsNotFolder",
Recursive: true,
SortBy: "SortName",
MediaTypes: "Audio,Video"
});
}
if (promise) {
promise.done(function (result) {
@ -801,11 +807,7 @@
SortBy: "Random"
};
if (item.IsFolder) {
query.ParentId = id;
}
else if (item.Type == "MusicArtist") {
if (item.Type == "MusicArtist") {
query.MediaTypes = "Audio";
query.Artists = item.Name;
@ -816,7 +818,12 @@
query.MediaTypes = "Audio";
query.Genres = item.Name;
} else {
}
else if (item.IsFolder) {
query.ParentId = id;
}
else {
return;
}