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

consolidate Artist & MusicArtist

Browse source
This commit is contained in:
Luke Pulverenti 2013-11-21 15:48:26 -05:00
parent ae1805916c
commit 5cdd9d0fb1
21 changed files with 316 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/scripts/Itemdetailpage.js
View file

@ -114,7 +114,7 @@
if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "BoxSet") {
return "movies";
}
if (item.Type == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "Artist" || item.Type == "MusicVideo") {
if (item.Type == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicVideo") {
return "music";
}
if (item.MediaType == "Game") {
@ -311,7 +311,7 @@
var artist = artists[i];
html.push('<a class="textlink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(artist) + '">' + artist + '</a>');
html.push('<a class="textlink" href="itembynamedetails.html?context=music&musicartist=' + ApiClient.encodeName(artist) + '">' + artist + '</a>');
}

10
dashboard-ui/scripts/edititemimages.js
View file

@ -18,10 +18,10 @@
function getBaseRemoteOptions() {
var options = {};
if (currentItem.Type == "Artist") {
options.artist = currentItem.Name;
if (currentItem.Type == "Year") {
options.year = currentItem.Name;
}
else if (currentItem.Type == "Artist") {
else if (currentItem.Type == "MusicArtist") {
options.artist = currentItem.Name;
}
else if (currentItem.Type == "Person") {
@ -157,7 +157,7 @@
if (currentItem.Type == "Episode") {
cssClass += " remoteBackdropImage";
}
else if (currentItem.Type == "MusicAlbum" || currentItem.Type == "MusicArtist" || currentItem.Type == "Artist") {
else if (currentItem.Type == "MusicAlbum" || currentItem.Type == "MusicArtist") {
cssClass += " remoteDiscImage";
}
else {
@ -300,7 +300,7 @@
updateTabs(page, item);
if (item.Type == "Person" || item.Type == "Studio" || item.Type == "MusicGenre" || item.Type == "Genre" || item.Type == "Artist" || item.Type == "GameGenre") {
if (item.Type == "Person" || item.Type == "Studio" || item.Type == "MusicGenre" || item.Type == "Genre" || item.Type == "MusicArtist" || item.Type == "GameGenre") {
$('#btnEditPeople', page).hide();
} else {
$('#btnEditPeople', page).show();

20
dashboard-ui/scripts/edititemmetadata.js
View file

@ -39,7 +39,7 @@
}
if (!item.ImageTags || !item.ImageTags.Logo) {
if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "Series" || item.Type == "Artist" || item.Type == "MusicArtist" || item.Type == "BoxSet") {
if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "Series" || item.Type == "MusicArtist" || item.Type == "BoxSet") {
htmlName += '<img src="css/images/editor/missinglogo.png" title="Missing logo image." />';
}
}
@ -252,10 +252,10 @@
return;
}
name = getParameterByName('artist', url);
name = getParameterByName('musicartist', url);
if (name) {
self.currentItemType = "Artist";
self.currentItemType = "MusicArtist";
self.currentItemName = name;
return;
}
@ -294,7 +294,7 @@
return ApiClient.getGameGenre(currentItemName, Dashboard.getCurrentUserId());
}
if (currentItemType == "Artist") {
if (currentItemType == "MusicArtist" && currentItemName) {
return ApiClient.getArtist(currentItemName, Dashboard.getCurrentUserId());
}
@ -314,7 +314,7 @@
item.Type == "Genre" ||
item.Type == "MusicGenre" ||
item.Type == "GameGenre" ||
item.Type == "Artist") {
item.Type == "MusicArtist") {
query = item.Type + "=" + ApiClient.encodeName(item.Name);
} else {
@ -387,7 +387,7 @@
setFieldVisibilities(page, item);
fillItemInfo(page, item);
if (item.Type == "Person" || item.Type == "Studio" || item.Type == "MusicGenre" || item.Type == "Genre" || item.Type == "Artist") {
if (item.Type == "Person" || item.Type == "Studio" || item.Type == "MusicGenre" || item.Type == "Genre" || item.Type == "MusicArtist") {
$('#btnEditPeople', page).hide();
} else {
$('#btnEditPeople', page).show();
@ -523,7 +523,7 @@
$('#fldImdb', page).hide();
}
if (item.Type == "Audio" || item.Type == "Artist" || item.Type == "MusicArtist" || item.Type == "MusicAlbum") {
if (item.Type == "Audio" || item.Type == "MusicArtist" || item.Type == "MusicAlbum") {
$('#fldMusicBrainz', page).show();
} else {
$('#fldMusicBrainz', page).hide();
@ -995,7 +995,7 @@
var updatePromise;
if (currentItem.Type == "Artist") {
if (currentItem.Type == "MusicArtist") {
updatePromise = ApiClient.updateArtist(item);
}
else if (currentItem.Type == "Genre") {
@ -1129,7 +1129,7 @@
if (val) {
if (currentItem.Type == "MusicArtist" || currentItem.Type == "Artist") {
if (currentItem.Type == "MusicArtist") {
$('#btnOpenMusicbrainz', page).attr('href', 'http://musicbrainz.org/artist/' + val);
} else {
$('#btnOpenMusicbrainz', page).attr('href', 'http://musicbrainz.org/release/' + val);
@ -1213,7 +1213,7 @@
var force = true;
if (currentItem.Type == "Artist") {
if (currentItem.Type == "MusicArtist") {
refreshPromise = ApiClient.refreshArtist(currentItem.Name, force);
}
else if (currentItem.Type == "Genre") {

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

@ -37,7 +37,7 @@
return ApiClient.getGameGenre(name, Dashboard.getCurrentUserId());
}
name = getParameterByName('artist');
name = getParameterByName('musicartist');
if (name) {
return ApiClient.getArtist(name, Dashboard.getCurrentUserId());
@ -134,7 +134,7 @@
if (context == "music" && item.Type == "MusicGenre") {
$('#musicGenreTabs', page).show();
}
if (context == "music" && item.Type == "Artist") {
if (context == "music" && item.Type == "MusicArtist") {
$('#artistTabs', page).show();
}
if (context == "games" && item.Type == "GameGenre") {
@ -389,7 +389,7 @@
else if (currentItem.Type == "Studio") {
query.Studios = currentItem.Name;
}
else if (currentItem.Type == "Artist") {
else if (currentItem.Type == "MusicArtist") {
query.Artists = currentItem.Name;
}
}

2
dashboard-ui/scripts/itemgallery.js
View file

@ -24,7 +24,7 @@
return ApiClient.getGenre(name, Dashboard.getCurrentUserId());
}
name = getParameterByName('artist');
name = getParameterByName('musicartist');
if (name) {
return ApiClient.getArtist(name, Dashboard.getCurrentUserId());

51
dashboard-ui/scripts/librarybrowser.js
View file

@ -153,7 +153,7 @@
imgUrl = "css/images/items/list/person.png";
isDefault = true;
}
else if (item.Type == "Artist") {
else if (item.Type == "MusicArtist") {
imgUrl = "css/images/items/list/audiocollection.png";
isDefault = true;
@ -229,7 +229,7 @@
//html += '<p class="itemMiscInfo">' + childText + '</p>';
}
else if (item.Type == "Genre" || item.Type == "Studio" || item.Type == "Person" || item.Type == "Artist" || item.Type == "MusicGenre" || item.Type == "GameGenre") {
else if (item.Type == "Genre" || item.Type == "Studio" || item.Type == "Person" || item.Type == "MusicArtist" || item.Type == "MusicGenre" || item.Type == "GameGenre") {
html += LibraryBrowser.getItemCountsHtml(options, item);
}
@ -426,7 +426,7 @@
if (item.AlbumArtist) {
html += '<td><a href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a></td>';
html += '<td><a href="itembynamedetails.html?context=music&musicartist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a></td>';
} else {
html += '<td></td>';
@ -470,7 +470,7 @@
var artist = artists[i];
html.push('<a href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(artist) + '">' + artist + '</a>');
html.push('<a href="itembynamedetails.html?context=music&musicartist=' + ApiClient.encodeName(artist) + '">' + artist + '</a>');
}
@ -495,7 +495,7 @@
html += '<ul data-role="listview" style="min-width: 150px;" data-theme="c">';
html += '<li data-role="list-divider" data-theme="a">Play Menu</li>';
if (itemType == "Artist") {
if (itemType == "MusicArtist") {
html += '<li><a href="#" onclick="MediaPlayer.playArtist(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Play</a></li>';
} else if (itemType != "MusicGenre") {
html += '<li><a href="#" onclick="MediaPlayer.playById(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Play</a></li>';
@ -508,7 +508,7 @@
html += '<li><a href="#" onclick="MediaPlayer.playInstantMixFromAlbum(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Instant Mix</a></li>';
html += '<li><a href="#" onclick="MediaPlayer.shuffleFolder(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Shuffle</a></li>';
}
else if (itemType == "Artist") {
else if (itemType == "MusicArtist") {
html += '<li><a href="#" onclick="MediaPlayer.playInstantMixFromArtist(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Instant Mix</a></li>';
html += '<li><a href="#" onclick="MediaPlayer.shuffleArtist(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Shuffle</a></li>';
}
@ -522,7 +522,7 @@
}
if (isPlaying) {
if (itemType == "Artist") {
if (itemType == "MusicArtist") {
html += '<li><a href="#" onclick="MediaPlayer.queueArtist(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Queue</a></li>';
} else if (itemType != "MusicGenre") {
html += '<li><a href="#" onclick="MediaPlayer.queue(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Queue</a></li>';
@ -587,8 +587,11 @@
if (item.Type == "Person") {
return "itembynamedetails.html?person=" + ApiClient.encodeName(item.Name) + "&context=" + itemByNameContext;
}
if (item.Type == "Artist") {
return "itembynamedetails.html?artist=" + ApiClient.encodeName(item.Name) + "&context=" + (itemByNameContext || "music");
if (item.Type == "MusicArtist") {
if (itemByNameContext == "music") {
return "itembynamedetails.html?musicartist=" + ApiClient.encodeName(item.Name) + "&context=" + (itemByNameContext || "music");
}
}
return item.IsFolder ? (id ? "itemList.html?parentId=" + id : "#") : "itemdetails.html?id=" + id;
@ -634,7 +637,7 @@
return ApiClient.getGameGenreImageUrl(item.Name, options);
}
if (item.Type == "Artist") {
if (item.Type == "MusicArtist") {
return ApiClient.getArtistImageUrl(item.Name, options);
}
@ -1055,7 +1058,7 @@
}
}
if (!item.IsFolder && item.Type !== "Genre" && item.Type !== "Studio" && item.Type !== "Person" && item.Type !== "Artist" && item.Type !== "MusicGenre" && item.Type !== "GameGenre") {
if (!item.IsFolder && item.Type !== "Genre" && item.Type !== "Studio" && item.Type !== "Person" && item.Type !== "MusicArtist" && item.Type !== "MusicGenre" && item.Type !== "GameGenre") {
var date = item.DateCreated;
var isPlayed = item.UserData && item.UserData.Played;
@ -1175,13 +1178,13 @@
var html = [];
if (item.AlbumArtist && item.Type == "Audio") {
html.push('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>');
html.push('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&musicartist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>');
}
else if (item.AlbumArtist && item.Type == "MusicAlbum") {
html.push('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>');
html.push('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&musicartist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>');
}
else if (item.Artists && item.Artists.length && item.Type == "MusicVideo") {
html.push('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.Artists[0]) + '">' + item.Artists[0] + '</a>');
html.push('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&musicartist=' + ApiClient.encodeName(item.Artists[0]) + '">' + item.Artists[0] + '</a>');
}
else if (item.SeriesName && item.Type == "Episode") {
@ -1259,7 +1262,7 @@
}
if (providerIds.Musicbrainz) {
if (item.Type == "MusicArtist" || item.Type == "Artist") {
if (item.Type == "MusicArtist") {
links.push('<a class="textlink" href="http://musicbrainz.org/artist/' + providerIds.Musicbrainz + '" target="_blank">MusicBrainz</a>');
} else {
links.push('<a class="textlink" href="http://musicbrainz.org/release/' + providerIds.Musicbrainz + '" target="_blank">MusicBrainz Release</a>');
@ -1494,7 +1497,7 @@
else if (type == "GameGenre") {
itemId = item.Name;
}
else if (type == "Artist") {
else if (type == "MusicArtist") {
itemId = item.Name;
}
@ -1566,7 +1569,7 @@
else if (type == "Studio") {
ApiClient.updateFavoriteStudioStatus(Dashboard.getCurrentUserId(), id, markAsFavorite);
}
else if (type == "Artist") {
else if (type == "MusicArtist") {
ApiClient.updateFavoriteArtistStatus(Dashboard.getCurrentUserId(), id, markAsFavorite);
}
else if (type == "Genre") {
@ -1653,7 +1656,7 @@
else if (type == "Studio") {
ApiClient.updateStudioRating(Dashboard.getCurrentUserId(), id, likes);
}
else if (type == "Artist") {
else if (type == "MusicArtist") {
ApiClient.updateArtistRating(Dashboard.getCurrentUserId(), id, likes);
}
else if (type == "Genre") {
@ -1678,7 +1681,7 @@
else if (type == "Studio") {
ApiClient.clearStudioRating(Dashboard.getCurrentUserId(), id);
}
else if (type == "Artist") {
else if (type == "MusicArtist") {
ApiClient.clearArtistRating(Dashboard.getCurrentUserId(), id);
}
else if (type == "Genre") {
@ -1740,7 +1743,7 @@
type: "Primary"
});
}
else if (item.Type == "Artist") {
else if (item.Type == "MusicArtist") {
url = ApiClient.getArtistImageUrl(item.Name, {
maxheight: 480,
tag: imageTags.Primary,
@ -1792,7 +1795,7 @@
type: "Backdrop"
});
}
else if (item.Type == "Artist") {
else if (item.Type == "MusicArtist") {
url = ApiClient.getArtistImageUrl(item.Name, {
maxheight: 480,
tag: item.BackdropImageTags[0],
@ -1844,7 +1847,7 @@
type: "Thumb"
});
}
else if (item.Type == "Artist") {
else if (item.Type == "MusicArtist") {
url = ApiClient.getArtistImageUrl(item.Name, {
maxheight: 480,
tag: imageTags.Thumb,
@ -1895,7 +1898,7 @@
var identifierName = "id";
var identifierValue = item.Id;
if (item.Type == "Person" || item.Type == "Genre" || item.Type == "Studio" || item.Type == "Artist" || item.Type == "MusicGenre" || item.Type == "GameGenre") {
if (item.Type == "Person" || item.Type == "Genre" || item.Type == "Studio" || item.Type == "MusicArtist" || item.Type == "MusicGenre" || item.Type == "GameGenre") {
identifierName = item.Type;
identifierValue = ApiClient.encodeName(item.Name);
}
@ -2062,7 +2065,7 @@
html += '&nbsp;&nbsp;/&nbsp;&nbsp;';
}
var param = item.Type == "Audio" || item.Type == "Artist" || item.Type == "MusicArtist" || item.Type == "MusicAlbum" ? "musicgenre" : "genre";
var param = item.Type == "Audio" || item.Type == "MusicArtist" || item.Type == "MusicAlbum" ? "musicgenre" : "genre";
if (item.MediaType == "Game") {
param = "gamegenre";

10
dashboard-ui/scripts/livetvchannels.js
View file

@ -40,14 +40,14 @@
function renderChannels(page, channels) {
var pagingHtml = LibraryBrowser.getPagingHtml({
//var pagingHtml = LibraryBrowser.getPagingHtml({
StartIndex: 0,
Limit: channels.length
// StartIndex: 0,
// Limit: channels.length
}, channels.length, true);
//}, channels.length, true);
$('.listTopPaging', page).html(pagingHtml).trigger('create');
//$('.listTopPaging', page).html(pagingHtml).trigger('create');
$('#items', page).html(getChannelsHtml(channels)).trigger('create');
}

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

@ -747,7 +747,7 @@
self.canPlay = function (item) {
if (item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "Artist" || item.Type == "MusicGenre") {
if (item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicGenre") {
return true;
}

162
dashboard-ui/scripts/musicalbumartists.js Normal file
View file

@ -0,0 +1,162 @@
(function ($, document) {
// The base query options
var query = {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "MusicArtist",
Recursive: true,
Fields: "DateCreated",
StartIndex: 0
};
function reloadItems(page) {
Dashboard.showLoadingMsg();
ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) {
// Scroll back up so they can see the results from the beginning
$(document).scrollTop(0);
var html = '';
$('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create');
updateFilterControls(page);
var checkSortOption = $('.radioSortBy:checked', page);
$('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
html += LibraryBrowser.getPosterDetailViewHtml({
items: result.Items,
preferBackdrop: false,
context: "music",
shape: "square"
});
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
$('#items', page).html(html).trigger('create');
$('.btnChangeToDefaultSort', page).on('click', function () {
query.StartIndex = 0;
query.SortOrder = 'Ascending';
query.SortBy = $('.defaultSort', page).data('sortby');
reloadItems(page);
});
$('.selectPage', page).on('change', function () {
query.StartIndex = (parseInt(this.value) - 1) * query.Limit;
reloadItems(page);
});
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;
reloadItems(page);
});
$('.btnPreviousPage', page).on('click', function () {
query.StartIndex -= query.Limit;
reloadItems(page);
});
$('.selectPageSize', page).on('change', function () {
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(page);
});
LibraryBrowser.saveQueryValues('musicartists', query);
Dashboard.hideLoadingMsg();
});
}
function updateFilterControls(page) {
// Reset form values using the last used query
$('.radioSortBy', page).each(function () {
this.checked = (query.SortBy || '').toLowerCase() == this.getAttribute('data-sortby').toLowerCase();
}).checkboxradio('refresh');
$('.radioSortOrder', page).each(function () {
this.checked = (query.SortOrder || '').toLowerCase() == this.getAttribute('data-sortorder').toLowerCase();
}).checkboxradio('refresh');
$('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater);
}
$(document).on('pageinit', "#musicAlbumArtistsPage", function () {
var page = this;
$('.radioSortBy', this).on('click', function () {
query.SortBy = this.getAttribute('data-sortby');
query.StartIndex = 0;
reloadItems(page);
});
$('.radioSortOrder', this).on('click', function () {
query.SortOrder = this.getAttribute('data-sortorder');
query.StartIndex = 0;
reloadItems(page);
});
$('.chkStandardFilter', this).on('change', function () {
var filterName = this.getAttribute('data-filter');
var filters = query.Filters || "";
filters = (',' + filters).replace(',' + filterName, '').substring(1);
if (this.checked) {
filters = filters ? (filters + ',' + filterName) : filterName;
}
query.StartIndex = 0;
query.Filters = filters;
reloadItems(page);
});
$('.alphabetPicker', this).on('alphaselect', function (e, character) {
query.NameStartsWithOrGreater = character;
query.StartIndex = 0;
reloadItems(page);
}).on('alphaclear', function (e) {
query.NameStartsWithOrGreater = '';
reloadItems(page);
});
}).on('pagebeforeshow', "#musicAlbumArtistsPage", function () {
var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) {
query.Limit = limit;
query.StartIndex = 0;
}
LibraryBrowser.loadSavedQueryValues('musicartists', query);
reloadItems(this);
}).on('pageshow', "#musicAlbumArtistsPage", function () {
updateFilterControls(this);
});
})(jQuery, document);

2
dashboard-ui/scripts/remotecontrol.js
View file

@ -163,7 +163,7 @@
return false;
}
if (item.Type == "Artist") {
if (item.Type == "MusicArtist") {
sendPlayArtistCommand(item, sessionIds[0], popup);

2
dashboard-ui/scripts/search.js
View file

@ -125,7 +125,7 @@
imgUrl = "css/images/items/searchhints/tv.png";
}
else if (hint.Type == "Audio" || hint.Type == "MusicAlbum" || hint.Type == "Artist") {
else if (hint.Type == "Audio" || hint.Type == "MusicAlbum" || hint.Type == "MusicArtist") {
imgUrl = "css/images/items/searchhints/music.png";

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

@ -896,8 +896,8 @@ var Dashboard = {
else if (type == "person") {
url = "itembynamedetails.html?person=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + context;
}
else if (type == "artist") {
url = "itembynamedetails.html?artist=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + (context || "music");
else if (type == "musicartist") {
url = "itembynamedetails.html?musicartist=" + ApiClient.encodeName(cmd.ItemName) + "&context=" + (context || "music");
}
if (url) {