andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #214 from jcass77/fix/213_popup_menu_items

Browse Source 
Hide 'Show...' popup menu options if URI's are not available.
This commit is contained in:
Nick Steel 2016-11-27 17:32:20 +00:00 committed by GitHub
commit 40fc8f67ba
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.rst
View File

@ -103,6 +103,14 @@ Project resources
Changelog
=========
v2.4.0 (UNRELEASED)
-------------------
**Fixes**
- Only show 'Show Album' or 'Show Artist' options in popup menus if URI's for those resources are available.
(Fixes: `#213 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/213>`_).
v2.3.0 (2016-05-15)
-------------------

26
mopidy_musicbox_webclient/static/js/gui.js
View File

@ -160,7 +160,7 @@ function popupTracks (e, listuri, trackuri, tlid) {
e = window.event
}
$('.popupTrackName').html(popupData[trackuri].name)
if (popupData[trackuri].album && popupData[trackuri].album.name) {
if (popupData[trackuri].album && popupData[trackuri].album.name && popupData[trackuri].album.uri) {
$('.popupAlbumName').html(popupData[trackuri].album.name)
$('.popupAlbumLi').show()
} else {
@ -168,26 +168,30 @@ function popupTracks (e, listuri, trackuri, tlid) {
}
var child = ''
$('.popupArtistsLi').hide()
$('.popupArtistsDiv').hide()
if (popupData[trackuri].artists) {
if (popupData[trackuri].artists.length === 1) {
if (popupData[trackuri].artists.length === 1 && popupData[trackuri].artists[0].uri) {
child = '<a href="#" onclick="library.showArtist(\'' + popupData[trackuri].artists[0].uri + '\');">Show Artist</a>'
$('.popupArtistName').html(popupData[trackuri].artists[0].name)
$('.popupArtistHref').attr('onclick', 'library.showArtist("' + popupData[trackuri].artists[0].uri + '");')
$('.popupArtistsDiv').hide()
$('.popupArtistsLi').show()
} else {
var isValidArtistURI = false
for (var j = 0; j < popupData[trackuri].artists.length; j++) {
child += '<li><a href="#" onclick="library.showArtist(\'' + popupData[trackuri].artists[j].uri + '\');"><span class="popupArtistName">' + popupData[trackuri].artists[j].name + '</span></a></li>'
if (popupData[trackuri].artists[j].uri) {
isValidArtistURI = true
child += '<li><a href="#" onclick="library.showArtist(\'' + popupData[trackuri].artists[j].uri + '\');"><span class="popupArtistName">' + popupData[trackuri].artists[j].name + '</span></a></li>'
}
}
if (isValidArtistURI) {
$('.popupArtistsLv').html(child).show()
$('.popupArtistsDiv').show()
// this makes the viewport of the window resize somehow
$('.popupArtistsLv').listview('refresh')
}
$('.popupArtistsLi').hide()
$('.popupArtistsLv').html(child).show()
$('.popupArtistsDiv').show()
// this makes the viewport of the window resize somehow
$('.popupArtistsLv').listview('refresh')
}
} else {
$('.popupArtistsDiv').hide()
$('.popupArtistsLi').hide()
}
var hash = document.location.hash.split('?')