Merge pull request #228 from jcass77/fix/227_popup_info
Show all available track info in the 'Show Track Info...' popup.
This commit is contained in:
Nick Steel
GitHub
commit
5859a591a4
@ -108,8 +108,9 @@ v2.4.0 (UNRELEASED)
|
||||
|
||||
- Now shows server name/IP address and port number at the bottom of the navigation pane. (Addresses: `#67 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/67>`_).
|
||||
- Add ability to insert a track anywhere in the current queue. (Addresses: `#75 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/75>`_).
|
||||
- Add 'Show Track Info' popup which can be activated from any context menu. The popup includes the URI of the track,
|
||||
which can be inserted into various lists elsewhere in the player.
|
||||
- Add 'Show Track Info' popup which can be activated from any context menu or by clicking on either the 'info' icon next
|
||||
to the album cover or the track's title text on the 'Now Playing' pane. The popup includes the URI of the track, which
|
||||
can be inserted into various lists elsewhere in the player.
|
||||
- Updated icon set for font-awesome 4.7.0.
|
||||
- Added 'Refresh' button for refreshing libraries. (Addresses: `#75 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/75>`_).
|
||||
|
||||
@ -123,6 +124,7 @@ v2.4.0 (UNRELEASED)
|
||||
- Now initializes the GUI properly, even if the user is offline or the Mopidy server cannot be reached.
|
||||
- Fixed `Alarm Clock <https://pypi.python.org/pypi/Mopidy-AlarmClock/>`_ detection.
|
||||
- When browsing the library using the local 'File' extension, only playable audio files will have context menu icons.
|
||||
- Show all available track information in the 'Show Track Info...' popup. (Fixes: `#227 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/227>`_).
|
||||
|
||||
v2.3.0 (2016-05-15)
|
||||
-------------------
|
||||
|
||||
@ -291,6 +291,13 @@ span.hostInfo {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.info-table input {
|
||||
color: #555;
|
||||
border: none;
|
||||
font-size: 1em;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.albumdivider h1, .table li h1 {
|
||||
font-size: 120% !important;
|
||||
}
|
||||
@ -361,6 +368,21 @@ span.hostInfo {
|
||||
font-size: initial;
|
||||
}
|
||||
|
||||
.infoBtn {
|
||||
top: 0;
|
||||
width: 90%;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.infoBtn i {
|
||||
font-size: 1.33em;
|
||||
color: #ddd;
|
||||
background: white;
|
||||
border-radius: 50%;
|
||||
height: 1em;
|
||||
width: 1em;
|
||||
}
|
||||
|
||||
.backnav {
|
||||
background-color: #ccc !important;
|
||||
}
|
||||
@ -401,11 +423,17 @@ span.hostInfo {
|
||||
/************
|
||||
* Popups *
|
||||
************/
|
||||
#modalalbum a, #modalartist a {
|
||||
#modalalbum a, #modalartist a, #modalname a {
|
||||
color: #444;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
#modalinfo {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
padding-top: .5em;
|
||||
}
|
||||
|
||||
.popupArtistLi,
|
||||
.popupAlbumLi {
|
||||
display: none
|
||||
|
||||
@ -130,13 +130,13 @@
|
||||
<li data-icon="playAll" data-iconshadow="false">
|
||||
<a href="#" onclick="return controls.playTracks(PLAY_ALL, mopidy);">Play All</a>
|
||||
</li>
|
||||
<li data-icon="playNext" class="addqueue">
|
||||
<li data-icon="playNext">
|
||||
<a href="#" onclick="return controls.playTracks(PLAY_NEXT, mopidy);">Play Track Next</a>
|
||||
</li>
|
||||
<li data-icon="add" class="addqueue">
|
||||
<li data-icon="add">
|
||||
<a href="#" onclick="return controls.playTracks(ADD_THIS_BOTTOM, mopidy);">Add Track to Bottom of Queue</a>
|
||||
</li>
|
||||
<li data-icon="addAll" class="addqueue">
|
||||
<li data-icon="addAll">
|
||||
<a href="#" onclick="return controls.playTracks(ADD_ALL_BOTTOM, mopidy);">Add All to Bottom of Queue</a>
|
||||
</li>
|
||||
<li class="popupAlbumLi">
|
||||
@ -151,7 +151,7 @@
|
||||
<ul data-icon="false" data-inset="false" data-role="listview" class="popupArtistsLv"></ul>
|
||||
</div>
|
||||
<li>
|
||||
<a href="#" onclick="return controls.showInfoPopup('#popupTracks', mopidy);">Show Track Info...</span></a>
|
||||
<a href="#" onclick="return controls.showInfoPopup('', '#popupTracks', mopidy);">Show Track Info...</span></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -181,7 +181,7 @@
|
||||
<ul data-icon="false" data-inset="false" data-role="listview" class="popupArtistsLv"></ul>
|
||||
</div>
|
||||
<li>
|
||||
<a href="#" onclick="return controls.showInfoPopup('#popupQueue', mopidy);">Show Track Info...</span></a>
|
||||
<a href="#" onclick="return controls.showInfoPopup('', '#popupQueue', mopidy);">Show Track Info...</span></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -260,36 +260,7 @@
|
||||
<th data-priority="persist"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="label">Name:</td>
|
||||
<td id="name-cell"></td>
|
||||
</tr>
|
||||
<tr id="album-row">
|
||||
<td class="label">Album:</td>
|
||||
<td id="album-cell"></td>
|
||||
</tr>
|
||||
<tr id="artist-row">
|
||||
<td class="label">Artist(s):</td>
|
||||
<td id="artist-cell"></td>
|
||||
</tr>
|
||||
<tr id="track-no-row">
|
||||
<td class="label">Track #:</td>
|
||||
<td id="track-no-cell"></td>
|
||||
</tr>
|
||||
<tr id="length-row">
|
||||
<td class="label">Length:</td>
|
||||
<td id="length-cell"></td>
|
||||
</tr>
|
||||
<tr id="bitrate-row">
|
||||
<td class="label">Bitrate:</td>
|
||||
<td id="bitrate-cell"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label label-center">URI:</td>
|
||||
<td><input type="text" id="uri-cell"></input></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tbody></tbody>
|
||||
</table>
|
||||
</div><!--/show track info-->
|
||||
|
||||
@ -363,10 +334,12 @@
|
||||
|
||||
<div id="nowPlayingpane" data-role="content" class="pane">
|
||||
|
||||
<img id="albumCoverImg" src="images/default_cover.png" alt="Album cover"/>
|
||||
<div id="modalinfo">
|
||||
<img id="albumCoverImg" src="images/default_cover.png" alt="Album cover"/>
|
||||
</div>
|
||||
|
||||
<div class="nowPlaying-artistInfo">
|
||||
<h3 id="modalname"></h3>
|
||||
<h3 id="modalname"></h3>
|
||||
<p class="artistAlbumLine"><span id="modalartist"></span> - <span id="modalalbum"></span></p>
|
||||
</div>
|
||||
|
||||
|
||||
141
mopidy_musicbox_webclient/static/js/controls.js
vendored
141
mopidy_musicbox_webclient/static/js/controls.js
vendored
@ -338,74 +338,129 @@
|
||||
})
|
||||
},
|
||||
|
||||
showInfoPopup: function (popupId, mopidy) {
|
||||
showInfoPopup: function (uri, popupId, mopidy) {
|
||||
showLoading(true)
|
||||
var uri = $(popupId).data('track')
|
||||
$(popupId).popup('close')
|
||||
mopidy.library.lookup({'uris': [uri]}).then(function (resultDict) {
|
||||
var trackUri = uri || $(popupId).data('track')
|
||||
if (popupId && popupId.length > 0) {
|
||||
$(popupId).popup('close')
|
||||
}
|
||||
$('#popupShowInfo tbody').empty()
|
||||
|
||||
mopidy.library.lookup({'uris': [trackUri]}).then(function (resultDict) {
|
||||
var uri = Object.keys(resultDict)[0]
|
||||
var track = resultDict[uri][0]
|
||||
var html = ''
|
||||
var rowTemplate = '<tr><td class="label">{label}:</td><td id="{label}-cell">{text}</td></tr>'
|
||||
var row = {'label': '', 'text': ''}
|
||||
|
||||
row.label = 'Name'
|
||||
if (track.name) {
|
||||
$('#popupShowInfo #name-cell').text(track.name)
|
||||
row.text = track.name
|
||||
} else {
|
||||
$('#popupShowInfo #name-cell').text('(Not available)')
|
||||
row.text = '(Not available)'
|
||||
}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
|
||||
row.label = 'Album'
|
||||
if (track.album && track.album.name) {
|
||||
$('#popupShowInfo #album-cell').text(track.album.name)
|
||||
row.text = track.album.name
|
||||
} else {
|
||||
$('#popupShowInfo #album-cell').text('(Not available)')
|
||||
row.text = '(Not available)'
|
||||
}
|
||||
var artistNames = ''
|
||||
if (track.artists && track.artists.length > 0) {
|
||||
for (var i = 0; i < track.artists.length; i++) {
|
||||
if (i > 0) {
|
||||
artistNames = artistNames + ', '
|
||||
}
|
||||
artistNames = artistNames + track.artists[i].name
|
||||
}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
|
||||
var artists = artistsToString(track.artists)
|
||||
// Fallback to album artists.
|
||||
if (artists.length === 0 && track.album && track.album.artists) {
|
||||
artists = artistsToString(track.album.artists)
|
||||
}
|
||||
|
||||
// Fallback to album artists.
|
||||
if (artistNames.length === 0 && track.album && track.album.artists && track.album.artists.length > 0) {
|
||||
for (i = 0; i < track.album.artists.length; i++) {
|
||||
if (i > 0) {
|
||||
artistNames = artistNames + ', '
|
||||
}
|
||||
artistNames = artistNames + track.album.artists[i].name
|
||||
if (artists.length > 0) {
|
||||
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
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
if (artistNames.length > 0) {
|
||||
$('#popupShowInfo #artist-cell').text(artistNames)
|
||||
$('#popupShowInfo #artist-row').show()
|
||||
} else {
|
||||
$('#popupShowInfo #artist-row').hide()
|
||||
|
||||
var composers = artistsToString(track.composers)
|
||||
if (composers.length > 0) {
|
||||
row.label = 'Composer'
|
||||
if (track.composers.length > 1) {
|
||||
row.label += 's'
|
||||
}
|
||||
row.text = composers
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
var performers = artistsToString(track.performers)
|
||||
if (performers.length > 0) {
|
||||
row.label = 'Performer'
|
||||
if (track.performers.length > 1) {
|
||||
row.label += 's'
|
||||
}
|
||||
row.text = performers
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
if (track.genre) {
|
||||
row = {'label': 'Genre', 'text': track.genre}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
if (track.track_no) {
|
||||
$('#popupShowInfo #track-no-cell').text(track.track_no)
|
||||
$('#popupShowInfo #track-no-row').show()
|
||||
} else {
|
||||
$('#popupShowInfo #track-no-row').hide()
|
||||
row = {'label': 'Track #', 'text': track.track_no}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
if (track.disc_no) {
|
||||
row = {'label': 'Disc #', 'text': track.disc_no}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
if (track.date) {
|
||||
row = {'label': 'Date', 'text': new Date(track.date).toLocaleString()}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
if (track.length) {
|
||||
$('#popupShowInfo #length-cell').text(timeFromSeconds(track.length / 1000))
|
||||
$('#popupShowInfo #length-row').show()
|
||||
} else {
|
||||
$('#popupShowInfo #length-row').hide()
|
||||
row = {'label': 'Length', 'text': timeFromSeconds(track.length / 1000)}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
if (track.bitrate) {
|
||||
$('#popupShowInfo #bitrate-cell').text(track.bitrate)
|
||||
$('#popupShowInfo #bitrate-row').show()
|
||||
} else {
|
||||
$('#popupShowInfo #bitrate-row').hide()
|
||||
row = {'label': 'Bitrate', 'text': track.bitrate}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
$('#popupShowInfo #uri-cell').val(uri)
|
||||
|
||||
if (track.comment) {
|
||||
row = {'label': 'Comment', 'text': track.comment}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
if (track.musicbrainz_id) {
|
||||
row = {'label': 'MusicBrainz ID', 'text': track.musicbrainz_id}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
if (track.last_modified) {
|
||||
row = {'label': 'Modified', 'text': track.last_modified}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
}
|
||||
|
||||
rowTemplate = '<tr><td class="label label-center">{label}:</td><td><input type="text" id="uri-input" value="{text}"></input></td></tr>'
|
||||
row = {'label': 'URI', 'text': uri}
|
||||
html += stringFromTemplate(rowTemplate, row)
|
||||
|
||||
$('#popupShowInfo tbody').append(html)
|
||||
|
||||
showLoading(false)
|
||||
$('#popupShowInfo').popup('open')
|
||||
if (!isMobile) {
|
||||
// Set focus and select URI text on desktop systems (don't want the keyboard to pop up automatically on mobile devices)
|
||||
$('#popupShowInfo #uri-cell').focus()
|
||||
$('#popupShowInfo #uri-cell').select()
|
||||
$('#popupShowInfo #uri-input').focus()
|
||||
$('#popupShowInfo #uri-input').select()
|
||||
}
|
||||
}, console.error)
|
||||
return false
|
||||
|
||||
@ -204,12 +204,14 @@ function getAlbum (pl) {
|
||||
function artistsToString (artists, max) {
|
||||
var result = ''
|
||||
max = max || 3
|
||||
for (var i = 0; i < artists.length && i < max; i++) {
|
||||
if (artists[i].name) {
|
||||
if (i > 0) {
|
||||
result += ', '
|
||||
if (artists && artists.length > 0) {
|
||||
for (var i = 0; i < artists.length && i < max; i++) {
|
||||
if (artists[i].name) {
|
||||
if (i > 0) {
|
||||
result += ', '
|
||||
}
|
||||
result += artists[i].name
|
||||
}
|
||||
result += artists[i].name
|
||||
}
|
||||
}
|
||||
return result
|
||||
@ -578,6 +580,13 @@ function isSpotifyStarredPlaylist (playlist) {
|
||||
return (starredRegex.test(playlist.uri) && playlist.name === 'Starred')
|
||||
}
|
||||
|
||||
// Returns a string where {x} in template is replaced by tokens[x].
|
||||
function stringFromTemplate (template, tokens) {
|
||||
return template.replace(/{[^}]+}/g, function (match) {
|
||||
return tokens[match.slice(1, -1)]
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts a URI to a jQuery-safe identifier. jQuery identifiers need to be
|
||||
* unique per page and cannot contain special characters.
|
||||
|
||||
@ -67,9 +67,9 @@ function resizeMb () {
|
||||
*/
|
||||
}
|
||||
|
||||
function setSongTitle (title, refresh_ui) {
|
||||
songdata.track.name = title
|
||||
$('#modalname').html(title)
|
||||
function setSongTitle (track, refresh_ui) {
|
||||
songdata.track.name = track.name
|
||||
$('#modalname').html('<a href="#" onclick="return controls.showInfoPopup(\'' + track.uri + '\', \'\', mopidy);">' + track.name + '</span></a>')
|
||||
if (refresh_ui) {
|
||||
resizeMb()
|
||||
}
|
||||
@ -98,7 +98,7 @@ function setSongInfo (data) {
|
||||
|
||||
songdata = data
|
||||
|
||||
setSongTitle(data.track.name, false)
|
||||
setSongTitle(data.track, false)
|
||||
songlength = Infinity
|
||||
|
||||
if (!data.track.length || data.track.length === 0) {
|
||||
@ -131,6 +131,12 @@ function setSongInfo (data) {
|
||||
$('#modalalbum').html('')
|
||||
}
|
||||
images.setAlbumImage(data.track.uri, '#infocover, #albumCoverImg', mopidy)
|
||||
if (data.track.uri) {
|
||||
// Add 'Show Info' icon to album image
|
||||
$('#modalinfo').append(
|
||||
'<a href="#" class="infoBtn" onclick="return controls.showInfoPopup(\'' + data.track.uri + '\', \'undefined\', mopidy);">' +
|
||||
'<i class="fa fa-info-circle"></i></a>')
|
||||
}
|
||||
|
||||
$('#modalartist').html(arttmp)
|
||||
|
||||
@ -190,10 +196,8 @@ function popupTracks (e, listuri, trackuri, tlid) {
|
||||
var divid = hash[0].substr(1)
|
||||
var popupName = ''
|
||||
if (divid === 'current') {
|
||||
$('.addqueue').hide()
|
||||
popupName = '#popupQueue'
|
||||
} else {
|
||||
$('.addqueue').show()
|
||||
popupName = '#popupTracks'
|
||||
}
|
||||
|
||||
@ -316,7 +320,8 @@ function initSocketevents () {
|
||||
})
|
||||
|
||||
mopidy.on('event:streamTitleChanged', function (data) {
|
||||
setSongTitle(data.title, true)
|
||||
// Update all track info.
|
||||
mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -126,19 +126,12 @@
|
||||
$('#searchtracks').show()
|
||||
}
|
||||
|
||||
// Returns a string where {x} in template is replaced by tokens[x].
|
||||
function theme (template, tokens) {
|
||||
return template.replace(/{[^}]+}/g, function (match) {
|
||||
return tokens[match.slice(1, -1)]
|
||||
})
|
||||
}
|
||||
|
||||
// 'Show more' pattern
|
||||
var showMorePattern = '<li onclick="$(this).hide().siblings().show(); return false;"><a>Show {count} more</a></li>'
|
||||
// 'Show more' template
|
||||
var showMoreTemplate = '<li onclick="$(this).hide().siblings().show(); return false;"><a>Show {count} more</a></li>'
|
||||
|
||||
// Artist results
|
||||
var child = ''
|
||||
var pattern = '<li><a href="#" onclick="return library.showArtist(this.id)" id={id}><i class="{class}"></i> <strong>{name}</strong></a></li>'
|
||||
var template = '<li><a href="#" onclick="return library.showArtist(this.id)" id={id}><i class="{class}"></i> <strong>{name}</strong></a></li>'
|
||||
var tokens
|
||||
|
||||
for (i = 0; i < results.artists.length; i++) {
|
||||
@ -150,11 +143,11 @@
|
||||
|
||||
// Add 'Show all' item after a certain number of hits.
|
||||
if (i === 4 && results.artists.length > 5) {
|
||||
child += theme(showMorePattern, {'count': results.artists.length - i})
|
||||
pattern = pattern.replace('<li>', '<li class="overflow">')
|
||||
child += stringFromTemplate(showMoreTemplate, {'count': results.artists.length - i})
|
||||
template = template.replace('<li>', '<li class="overflow">')
|
||||
}
|
||||
|
||||
child += theme(pattern, tokens)
|
||||
child += stringFromTemplate(template, tokens)
|
||||
}
|
||||
|
||||
// Inject list items, refresh listview and hide superfluous items.
|
||||
@ -162,10 +155,10 @@
|
||||
|
||||
// Album results
|
||||
child = ''
|
||||
pattern = '<li><a href="#" onclick="return library.showAlbum(this.id)" id="{albumId}">'
|
||||
pattern += '<h5 data-role="heading"><i class="{class}"></i> {albumName}</h5>'
|
||||
pattern += '<p data-role="desc">{artistName}</p>'
|
||||
pattern += '</a></li>'
|
||||
template = '<li><a href="#" onclick="return library.showAlbum(this.id)" id="{albumId}">'
|
||||
template += '<h5 data-role="heading"><i class="{class}"></i> {albumName}</h5>'
|
||||
template += '<p data-role="desc">{artistName}</p>'
|
||||
template += '</a></li>'
|
||||
|
||||
for (i = 0; i < results.albums.length; i++) {
|
||||
tokens = {
|
||||
@ -187,11 +180,11 @@
|
||||
}
|
||||
// Add 'Show all' item after a certain number of hits.
|
||||
if (i === 4 && results.albums.length > 5) {
|
||||
child += theme(showMorePattern, {'count': results.albums.length - i})
|
||||
pattern = pattern.replace('<li>', '<li class="overflow">')
|
||||
child += stringFromTemplate(showMoreTemplate, {'count': results.albums.length - i})
|
||||
template = template.replace('<li>', '<li class="overflow">')
|
||||
}
|
||||
|
||||
child += theme(pattern, tokens)
|
||||
child += stringFromTemplate(template, tokens)
|
||||
}
|
||||
// Inject list items, refresh listview and hide superfluous items.
|
||||
$(SEARCH_ALBUM_TABLE).html(child).listview('refresh').find('.overflow').hide()
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CACHE MANIFEST
|
||||
|
||||
# 2017-01-18:v2
|
||||
# 2017-01-29:v4
|
||||
|
||||
NETWORK:
|
||||
*
|
||||
|
||||
@ -363,12 +363,21 @@ describe('controls', function () {
|
||||
|
||||
describe('#showInfoPopup()', function () {
|
||||
var track
|
||||
var popup = $('<div data-role="popup" id="popupShowInfo"></div>')
|
||||
var popup = $('<div data-role="popup" id="popupShowInfo"><table><thead><tr><th></th><th></th></tr></thead><tbody></tbody></div>')
|
||||
|
||||
before(function () {
|
||||
track = {
|
||||
'uri': QUEUE_TRACKS[0].uri,
|
||||
'length': 61000
|
||||
'length': 61000,
|
||||
'artists': [
|
||||
{
|
||||
'uri': 'artistUri1',
|
||||
'name': 'nameMock1'
|
||||
}, {
|
||||
'uri': 'artistUri2',
|
||||
'name': 'nameMock2'
|
||||
}
|
||||
]
|
||||
}
|
||||
var library = {
|
||||
lookup: sinon.stub()
|
||||
@ -377,7 +386,7 @@ describe('controls', function () {
|
||||
mopidy.library.lookup.returns($.when({'track:tlTrackMock1': [track]}))
|
||||
|
||||
$(document.body).append(popup)
|
||||
$('#popupTracks').data(track, track.uri) // Simulate selection from context menu
|
||||
$('#popupShowInfo').data(track, track.uri) // Simulate selection from context menu
|
||||
$('#popupShowInfo').popup() // Initialize popup
|
||||
})
|
||||
|
||||
@ -386,21 +395,23 @@ describe('controls', function () {
|
||||
})
|
||||
|
||||
it('should default track name', function () {
|
||||
popup.append('<span id="name-cell"></span>')
|
||||
controls.showInfoPopup('#popupTracks', mopidy)
|
||||
assert.equal($('#name-cell').text(), '(Not available)')
|
||||
controls.showInfoPopup('', '#popupShowInfo', mopidy)
|
||||
assert.equal($('td:contains("Name:")').siblings('td').text(), '(Not available)')
|
||||
})
|
||||
|
||||
it('should default album name', function () {
|
||||
popup.append('<span id="album-cell"></span>')
|
||||
controls.showInfoPopup('#popupTracks', mopidy)
|
||||
assert.equal($('#album-cell').text(), '(Not available)')
|
||||
controls.showInfoPopup('', '#popupShowInfo', mopidy)
|
||||
assert.equal($('td:contains("Album:")').siblings('td').text(), '(Not available)')
|
||||
})
|
||||
|
||||
it('should add leading zero if seconds length < 10', function () {
|
||||
popup.append('<span id="length-cell"></span>')
|
||||
controls.showInfoPopup('#popupTracks', mopidy)
|
||||
assert.equal($('#length-cell').text(), '1:01')
|
||||
controls.showInfoPopup('', '#popupShowInfo', mopidy)
|
||||
assert.equal($('td:contains("Length:")').siblings('td').text(), '1:01')
|
||||
})
|
||||
|
||||
it('should show plural for artist name', function () {
|
||||
controls.showInfoPopup('', '#popupShowInfo', mopidy)
|
||||
assert.isOk($('td:contains("Artists:")'))
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user