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

Verify popup ID parameter before close.

Browse Source
This commit is contained in:
jcass 2017-01-29 12:49:11 +02:00
parent 668fffcd16
commit 567877f858
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mopidy_musicbox_webclient/static/js/controls.js vendored
View File

@ -341,7 +341,9 @@
showInfoPopup: function (uri, popupId, mopidy) { showInfoPopup: function (uri, popupId, mopidy) {
showLoading(true) showLoading(true)
var trackUri = uri || $(popupId).data('track') var trackUri = uri || $(popupId).data('track')
if (popupId && popupId.length > 0) {
$(popupId).popup('close') $(popupId).popup('close')
}
$('#popupShowInfo tbody').empty() $('#popupShowInfo tbody').empty()
mopidy.library.lookup({'uris': [trackUri]}).then(function (resultDict) { mopidy.library.lookup({'uris': [trackUri]}).then(function (resultDict) {
@ -374,10 +376,9 @@
} }
if (artists.length > 0) { if (artists.length > 0) {
if (track.artists && track.artists.length > 1 || track.album && track.album.artists && track.album.artists.length > 1) {
row.label = 'Artists'
} else {
row.label = 'Artist' row.label = 'Artist'
if (track.artists && track.artists.length > 1 || track.album && track.album.artists && track.album.artists.length > 1) {
row.label += 's'
} }
row.text = artists row.text = artists
html += stringFromTemplate(rowTemplate, row) html += stringFromTemplate(rowTemplate, row)
@ -385,10 +386,9 @@
var composers = artistsToString(track.composers) var composers = artistsToString(track.composers)
if (composers.length > 0) { if (composers.length > 0) {
if (track.composers.length > 1) {
row.label = 'Composers'
} else {
row.label = 'Composer' row.label = 'Composer'
if (track.composers.length > 1) {
row.label += 's'
} }
row.text = composers row.text = composers
html += stringFromTemplate(rowTemplate, row) html += stringFromTemplate(rowTemplate, row)
@ -396,10 +396,9 @@
var performers = artistsToString(track.performers) var performers = artistsToString(track.performers)
if (performers.length > 0) { if (performers.length > 0) {
if (track.performers.length > 1) {
row.label = 'Performers'
} else {
row.label = 'Performer' row.label = 'Performer'
if (track.performers.length > 1) {
row.label += 's'
} }
row.text = performers row.text = performers
html += stringFromTemplate(rowTemplate, row) html += stringFromTemplate(rowTemplate, row)

2
mopidy_musicbox_webclient/static/mb.appcache
View File

@ -1,6 +1,6 @@
CACHE MANIFEST CACHE MANIFEST
# 2017-01-29:v3 # 2017-01-29:v4
NETWORK: NETWORK:
* *