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

Merge pull request #197 from jcass77/fix/196_small_divider

Browse Source 
fix:Small divider should not be rendered before last track in an album.
This commit is contained in:
Nick Steel 2016-05-05 00:17:12 +01:00
commit 295b4831c0
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mopidy_musicbox_webclient/static/js/functionsvars.js
View File

@ -219,7 +219,7 @@ function renderSongLi (previousTrack, track, nextTrack, uri, tlid, target, curre
'<i class="fa fa-ellipsis-v"></i></a>' + '<i class="fa fa-ellipsis-v"></i></a>' +
'<a href="#" onclick="' + onClick + '"><h1><i class="' + getMediaClass(track.uri) + '"></i> ' + track.name + '</h1>' '<a href="#" onclick="' + onClick + '"><h1><i class="' + getMediaClass(track.uri) + '"></i> ' + track.name + '</h1>'
if (listLength === 1 || !hasSameAlbum(previousTrack, track) && !hasSameAlbum(track, nextTrack)) { if (listLength === 1 || (!hasSameAlbum(previousTrack, track) && !hasSameAlbum(track, nextTrack))) {
html += renderSongLiAlbumInfo(track) html += renderSongLiAlbumInfo(track)
} }
html += '</a></li>' html += '</a></li>'
@ -257,7 +257,7 @@ function renderSongLiTrackArtists (track) {
} }
/* Tracklist renderer to insert dividers between albums. */ /* Tracklist renderer to insert dividers between albums. */
function renderSongLiDivider (previousTrack, track, nextTrack, currentIndex, target) { function renderSongLiDivider (previousTrack, track, nextTrack, target) {
var html = '' var html = ''
// Render differently if part of an album. // Render differently if part of an album.
if (!hasSameAlbum(previousTrack, track) && hasSameAlbum(track, nextTrack)) { if (!hasSameAlbum(previousTrack, track) && hasSameAlbum(track, nextTrack)) {
@ -269,7 +269,7 @@ function renderSongLiDivider (previousTrack, track, nextTrack, currentIndex, tar
renderSongLiTrackArtists(track) + '</p></a></li>' renderSongLiTrackArtists(track) + '</p></a></li>'
// Retrieve album covers // Retrieve album covers
images.setAlbumImage(track.uri, getjQueryID(target + '-cover', track.uri, true), mopidy, 'small') images.setAlbumImage(track.uri, getjQueryID(target + '-cover', track.uri, true), mopidy, 'small')
} else if (!hasSameAlbum(track, nextTrack) && currentIndex > 0) { } else if (previousTrack && !hasSameAlbum(previousTrack, track)) {
// Small divider // Small divider
html += '<li class="smalldivider"> &nbsp;</li>' html += '<li class="smalldivider"> &nbsp;</li>'
} }
@ -341,7 +341,7 @@ function resultsToTables (results, target, uri, onClickBack, backIsOptional) {
nextTrack = nextTrack ? nextTrack.track : undefined nextTrack = nextTrack ? nextTrack.track : undefined
} }
popupData[track.uri] = track popupData[track.uri] = track
html += renderSongLiDivider(previousTrack, track, nextTrack, i, target) html += renderSongLiDivider(previousTrack, track, nextTrack, target)
html += renderSongLi(previousTrack, track, nextTrack, uri, tlid, target, i, results.length) html += renderSongLi(previousTrack, track, nextTrack, uri, tlid, target, i, results.length)
} }
} }

5
mopidy_musicbox_webclient/static/js/process_ws.js
View File

@ -137,10 +137,7 @@ function processBrowseDir (resultArr) {
if (uris.length === 1 || (previousTrack && !hasSameAlbum(previousTrack, track) && !hasSameAlbum(track, nextTrack))) { if (uris.length === 1 || (previousTrack && !hasSameAlbum(previousTrack, track) && !hasSameAlbum(track, nextTrack))) {
renderSongLiAlbumInfo(track, BROWSE_TABLE) renderSongLiAlbumInfo(track, BROWSE_TABLE)
} }
if (!hasSameAlbum(previousTrack, track)) { renderSongLiDivider(previousTrack, track, nextTrack, BROWSE_TABLE)
// Starting to render a new album in the list.
renderSongLiDivider(previousTrack, track, nextTrack, i, BROWSE_TABLE)
}
} }
}) })
showLoading(false) showLoading(false)