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

Merge pull request #88 from wagamama/multi-songs

Browse Source 
Identify tracklist items using the tracklist ID. Fixes #81.
This commit is contained in:
Nick Steel 2015-04-11 11:09:29 +01:00
commit 2c946d4fdd
6 changed files with 139 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mopidy_musicbox_webclient/static/index.html
View File

@ -169,7 +169,7 @@
<div data-role="collapsible-set"> <div data-role="collapsible-set">
<ul data-role="listview" data-icon="false" id="popupTracksLv"> <ul data-role="listview" data-icon="false" id="popupTracksLv">
<li> <li>
<a href="#" onclick="return playTrack();">Play <span class="popupTrackName"></span></a> <a href="#" onclick="return playTrack(PLAY_NOW);">Play <span class="popupTrackName"></span></a>
</li> </li>
<li class="addqueue"> <li class="addqueue">
<a href="#" onclick="return playTrack(PLAY_NEXT);">Play Track Next</a> <a href="#" onclick="return playTrack(PLAY_NEXT);">Play Track Next</a>
@ -304,7 +304,6 @@
<label for="trackslider" disabled="disabled" class="ui-hidden-accessible">Position</label> <label for="trackslider" disabled="disabled" class="ui-hidden-accessible">Position</label>
<input id="trackslider" name="trackslider" data-mini="true" type="range" onchange="doSeekPos(this.value);" /> <input id="trackslider" name="trackslider" data-mini="true" type="range" onchange="doSeekPos(this.value);" />
</div> </div>
</div> </div>
<!-- /nowplaying --> <!-- /nowplaying -->
@ -429,7 +428,7 @@
Save Save
</button> </button>
<br/> <br/>
<button class="btn" type="button" onclick="$('#streamuriinput').val(songdata.uri); return true;"> <button class="btn" type="button" onclick="$('#streamuriinput').val(songdata.track.uri); return true;">
Add currently playing url Add currently playing url
</button> </button>
</form> </form>

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

@ -122,7 +122,7 @@ function playTrack(addtoqueue) {
//find track that is playing //find track that is playing
for (var playing = 0; playing < currentplaylist.length; playing++) { for (var playing = 0; playing < currentplaylist.length; playing++) {
if (currentplaylist[playing].uri == songdata.uri) { if (currentplaylist[playing].tlid == songdata.tlid) {
break; break;
} }
} }
@ -212,25 +212,26 @@ function playTrackByUri(track_uri, playlist_uri) {
/*** /***
* Plays a Track from a Playlist. * Plays a Track from a Playlist.
* @param uri * @param uri
* @param playlisturi * @param tlid
* @returns {boolean} * @returns {boolean}
*/ */
function playTrackQueueByUri(uri, playlisturi) { function playTrackQueueByTlid(uri, tlid) {
// console.log('playquuri'); // console.log('playquuri');
//stop directly, for user feedback //stop directly, for user feedback
mopidy.playback.stop(); mopidy.playback.stop();
$('#popupQueue').popup('close'); $('#popupQueue').popup('close');
toast('Loading...'); toast('Loading...');
tlid = parseInt(tlid);
mopidy.tracklist.filter({ mopidy.tracklist.filter({
'uri': [uri] 'tlid': [tlid]
}).then( }).then(
function(tltracks) { function(tltracks) {
if (tltracks.length > 0) { if (tltracks.length > 0) {
mopidy.playback.play(tltracks[0]); mopidy.playback.play(tltracks[0]);
return; return;
} }
console.log('Failed to play selected track ', uri); console.log('Failed to play selected track ', tlid);
} }
); );
return false; return false;
@ -242,9 +243,9 @@ function playTrackQueueByUri(uri, playlisturi) {
*/ */
function playTrackQueue() { function playTrackQueue() {
// console.log('playqu'); // console.log('playqu');
playlisturi = $('#popupQueue').data("list");
uri = $('#popupQueue').data("track"); uri = $('#popupQueue').data("track");
return playTrackQueueByUri(uri, playlisturi); tlid = $('#popupQueue').data("tlid");
return playTrackQueueByTlid(uri, tlid);
} }
/******************************************************** /********************************************************
@ -254,18 +255,9 @@ function removeTrack() {
$('#popupQueue').popup('close'); $('#popupQueue').popup('close');
toast('Deleting...'); toast('Deleting...');
uri = $('#popupQueue').data("track"); tlid = parseInt($('#popupQueue').data("tlid"));
console.log(uri); console.log(tlid);
mopidy.tracklist.remove({'tlid':[tlid]});
for (var i = 0; i < currentplaylist.length; i++) {
if (currentplaylist[i].uri == uri) {
break;
}
}
var track = {};
track.uri = [currentplaylist[i].uri];
mopidy.tracklist.remove({'uri':track.uri});
// console.log(currentplaylist[i].uri);
} }
function clearQueue() { function clearQueue() {
@ -308,7 +300,7 @@ function doPlay() {
if (!play) { if (!play) {
mopidy.playback.play(); mopidy.playback.play();
} else { } else {
if(isStreamUri(songdata.uri)) { if(isStreamUri(songdata.track.uri)) {
mopidy.playback.stop(); mopidy.playback.stop();
} else { } else {
mopidy.playback.pause(); mopidy.playback.pause();

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

@ -34,7 +34,7 @@ var songlength = 0;
var artistshtml = ''; var artistshtml = '';
var artiststext = ''; var artiststext = '';
var songname = ''; var songname = '';
var songdata = ''; var songdata = {'track':{}, 'tlid':-1};
var newposition = 0; var newposition = 0;
var playlisttracksScroll; var playlisttracksScroll;
@ -172,14 +172,14 @@ function albumTracksToTable(pl, target, uri) {
for (var i = 0; i < pl.length; i++) { for (var i = 0; i < pl.length; i++) {
popupData[pl[i].uri] = pl[i]; popupData[pl[i].uri] = pl[i];
liID = targetmin + '-' + pl[i].uri; liID = targetmin + '-' + pl[i].uri;
tmp += renderSongLi(pl[i], liID, uri, 'playTrackByUri'); tmp += renderSongLi(pl[i], liID, uri);
}; };
tmp += '</ul>'; tmp += '</ul>';
$(target).html(tmp); $(target).html(tmp);
$(target).attr('data', uri); $(target).attr('data', uri);
} }
function renderSongLi(song, liID, uri, playlistType) { function renderSongLi(song, liID, uri) {
var name; var name;
if (!song.name || song.name == '') { if (!song.name || song.name == '') {
name = uri.split('/'); name = uri.split('/');
@ -190,12 +190,29 @@ function renderSongLi(song, liID, uri, playlistType) {
// var iconClass = getMediaClass(liID.split('-')[1]); // var iconClass = getMediaClass(liID.split('-')[1]);
songLi = '<li class="song albumli" id="' + liID + '">' + songLi = '<li class="song albumli" id="' + liID + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\');">' + '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\');">' +
'<i class="fa fa-ellipsis-v"></i>' + '<i class="fa fa-ellipsis-v"></i></a>' +
'</a>' + '<a href="#" onclick="return ' + playlistType + '(\'' + song.uri + '\',\'' + uri + '\');">' + '<a href="#" onclick="return playTrackByUri(\'' + song.uri + '\',\'' + uri + '\');">' +
// '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' + // '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' +
'<h1 class="trackname">' + name + '</h1>' + '<h1 class="trackname">' + name + '</h1></a>' +
'</a>' + '</li>';
return songLi;
}
function renderQueueSongLi(song, liID, uri, tlid) {
var name;
if (!song.name || song.name == '') {
name = uri.split('/');
name = decodeURI(name[name.length - 1]);
} else {
name = song.name;
}
// var iconClass = getMediaClass(liID.split('-')[1]);
songLi = '<li class="song albumli" id="' + liID + '" tlid="' + tlid + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\',\'' + tlid + '\');">' +
'<i class="fa fa-ellipsis-v"></i></a>' +
'<a href="#" onclick="return playTrackQueueByTlid(\'' + song.uri + '\',\'' + tlid + '\');">' +
// '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' +
'<h1 class="trackname">' + name + '</h1></a>' +
'</li>'; '</li>';
return songLi; return songLi;
} }
@ -204,15 +221,16 @@ function resultsToTables(results, target, uri) {
if (!results) { if (!results) {
return return
} }
if (target == '#currenttable') { var tlids = [];
playlistType = 'playTrackQueueByUri'; if (target == CURRENT_PLAYLIST_TABLE) {
} else if (target == SEARCH_TRACK_TABLE) { for (i = 0; i < results.length; i++) {
playlistType = 'playTrackByUri'; tlids[i] = results[i].tlid;
} else { results[i] = results[i].track;
playlistType = 'playTrackByUri'; }
} }
var newalbum = []; var newalbum = [];
var newtlids = [];
//keep a list of albums for retreiving of covers //keep a list of albums for retreiving of covers
var coversList = []; var coversList = [];
var nextname = ''; var nextname = '';
@ -247,6 +265,7 @@ function resultsToTables(results, target, uri) {
if (results[i].name.substring(0, 12) == '[unplayable]') continue; if (results[i].name.substring(0, 12) == '[unplayable]') continue;
newalbum.push(results[i]); newalbum.push(results[i]);
newtlids.push(tlids[i]);
nextname = ''; nextname = '';
if ((i < length - 1) && results[i + 1].album && results[i + 1].album.name) { if ((i < length - 1) && results[i + 1].album && results[i + 1].album.name) {
nextname = results[i + 1].album.name; nextname = results[i + 1].album.name;
@ -254,6 +273,7 @@ function resultsToTables(results, target, uri) {
if (results[i].length == -1) { if (results[i].length == -1) {
html += '<li class="albumli"><a href="#"><h1><i class="' + iconClass + '"></i> ' + results[i].name + ' [Stream]</h1></a></li>'; html += '<li class="albumli"><a href="#"><h1><i class="' + iconClass + '"></i> ' + results[i].name + ' [Stream]</h1></a></li>';
newalbum = []; newalbum = [];
newtlids = [];
nextname = ''; nextname = '';
} else { } else {
if ((results[i].album.name != nextname) || (nextname == '')) { if ((results[i].album.name != nextname) || (nextname == '')) {
@ -264,11 +284,21 @@ function resultsToTables(results, target, uri) {
html += '<li class="smalldivider"> &nbsp;</li>'; html += '<li class="smalldivider"> &nbsp;</li>';
} }
iconClass = getMediaClass(newalbum[0].uri); iconClass = getMediaClass(newalbum[0].uri);
html += '<li class="song albumli" id="' + targetmin + '-' + newalbum[0].uri + '">' + var liID = targetmin + '-' + newalbum[0].uri;
if (target == CURRENT_PLAYLIST_TABLE) {
html += '<li class="song albumli" id="' + liID + '" tlid="' + newtlids[0] + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[0].uri + '\',\'' + newtlids[0] + '\');">' +
'<i class="fa fa-ellipsis-v"></i></a>' +
'<a href="#" onclick="return playTrackQueueByTlid(\'' + newalbum[0].uri + '\',\'' + newtlids[0] + '\');">' +
'<h1><i class="' + iconClass + '"></i> ' + newalbum[0].name + "</h1><p>";
} else {
html += '<li class="song albumli" id="' + liID + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[0].uri + '\');">' + '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[0].uri + '\');">' +
'<i class="fa fa-ellipsis-v"></i></a>' + '<i class="fa fa-ellipsis-v"></i></a>' +
'<a href="#" onclick="return ' + playlistType + '(\'' + newalbum[0].uri + '\',\'' + uri + '\');">' + '<a href="#" onclick="return playTrackByUri(\'' + newalbum[0].uri + '\',\'' + uri + '\');">' +
'<h1><i class="' + iconClass + '"></i> ' + newalbum[0].name + "</h1><p>"; '<h1><i class="' + iconClass + '"></i> ' + newalbum[0].name + "</h1><p>";
}
/* '<span style="float: right;">' + timeFromSeconds(newalbum[0].length / 1000) + '</span>'; */ /* '<span style="float: right;">' + timeFromSeconds(newalbum[0].length / 1000) + '</span>'; */
if (newalbum[0].artists) { if (newalbum[0].artists) {
for (j = 0; j < newalbum[0].artists.length; j++) { for (j = 0; j < newalbum[0].artists.length; j++) {
@ -289,6 +319,7 @@ function resultsToTables(results, target, uri) {
popupData[newalbum[0].uri] = newalbum[0]; popupData[newalbum[0].uri] = newalbum[0];
newalbum = []; newalbum = [];
newtlids = [];
} else { //newalbum length } else { //newalbum length
if (results[i].album.uri && results[i].album.name) { if (results[i].album.uri && results[i].album.name) {
// iconClass = getMediaClass(results[i].album.uri); // iconClass = getMediaClass(results[i].album.uri);
@ -315,12 +346,17 @@ function resultsToTables(results, target, uri) {
//hERE! //hERE!
var liID = targetmin + '-' + newalbum[j].uri; var liID = targetmin + '-' + newalbum[j].uri;
html += renderSongLi(newalbum[j], liID, uri, playlistType); if (target == CURRENT_PLAYLIST_TABLE) {
html += renderQueueSongLi(newalbum[j], liID, uri, newtlids[j]);
} else {
html += renderSongLi(newalbum[j], liID, uri);
}
//html += '<li class="albumli" id="' + targetmin + '-' + newalbum[j].uri + '"><a href="#" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[j].uri + '\');">'; //html += '<li class="albumli" id="' + targetmin + '-' + newalbum[j].uri + '"><a href="#" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[j].uri + '\');">';
//html += '<p class="pright">' + timeFromSeconds(newalbum[j].length / 1000) + '</p><h1>' + newalbum[j].name + '</h1></a></li>'; //html += '<p class="pright">' + timeFromSeconds(newalbum[j].length / 1000) + '</p><h1>' + newalbum[j].name + '</h1></a></li>';
} }
newalbum = []; newalbum = [];
newtlids = [];
if (results[i].album) { if (results[i].album) {
coversList.push([results[i].album, i]); coversList.push([results[i].album, i]);
} }

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

@ -12,16 +12,18 @@ function resetSong() {
setPlayState(false); setPlayState(false);
setPosition(0); setPosition(0);
var data = new Object; var data = new Object;
data.name = ''; data.tlid = -1;
data.artists = ''; data.track = new Object;
data.length = 0; data.track.name = '';
data.uri = ' '; data.track.artists = '';
data.track.length = 0;
data.track.uri = ' ';
setSongInfo(data); setSongInfo(data);
} }
} }
function resizeMb() { function resizeMb() {
$("#infoname").html(songdata.name); $("#infoname").html(songdata.track.name);
$("#infoartist").html(artiststext); $("#infoartist").html(artiststext);
if ($(window).width() <= 960) { if ($(window).width() <= 960) {
@ -72,58 +74,58 @@ function resizeMb() {
function setSongInfo(data) { function setSongInfo(data) {
// console.log(data, songdata); // console.log(data, songdata);
if (!data ) { return; } if (!data ) { return; }
if ( (data.uri == songdata.uri) ) { return;} if (data.tlid == songdata.tlid) { return; }
if (!data.name || data.name == '') { if (!data.track.name || data.track.name == '') {
var name = data.uri.split('/'); var name = data.track.uri.split('/');
data.name = decodeURI(name[name.length - 1]); data.track.name = decodeURI(name[name.length - 1]);
}; };
updatePlayIcons(data.uri); updatePlayIcons(data.track.uri, data.tlid);
artistshtml = ''; artistshtml = '';
artiststext = ''; artiststext = '';
if (validUri(data.name)) { if (validUri(data.track.name)) {
for (var key in streamUris) { for (var key in streamUris) {
rs = streamUris[key]; rs = streamUris[key];
if (rs && rs[1] == data.name) { if (rs && rs[1] == data.track.name) {
data.name = (rs[0] || rs[1]); data.track.name = (rs[0] || rs[1]);
} }
}; };
} }
songdata = data; songdata = data;
$("#modalname").html(data.name); $("#modalname").html(data.track.name);
if (!data.length || data.length == 0) { if (!data.track.length || data.track.length == 0) {
songlength = 0; songlength = 0;
$("#songlength").html(''); $("#songlength").html('');
pausePosTimer(); pausePosTimer();
$('#trackslider').slider('disable'); $('#trackslider').slider('disable');
// $('#streamnameinput').val(data.name); // $('#streamnameinput').val(data.track.name);
// $('#streamuriinput').val(data.uri); // $('#streamuriinput').val(data.track.uri);
} else { } else {
songlength = data.length; songlength = data.track.length;
$("#songlength").html(timeFromSeconds(data.length / 1000)); $("#songlength").html(timeFromSeconds(data.track.length / 1000));
$('#trackslider').slider('enable'); $('#trackslider').slider('enable');
} }
var arttmp = ''; var arttmp = '';
if(data.artists) { if(data.track.artists) {
for (var j = 0; j < data.artists.length; j++) { for (var j = 0; j < data.track.artists.length; j++) {
artistshtml += '<a href="#" onclick="return showArtist(\'' + data.artists[j].uri + '\');">' + data.artists[j].name + '</a>'; artistshtml += '<a href="#" onclick="return showArtist(\'' + data.track.artists[j].uri + '\');">' + data.track.artists[j].name + '</a>';
artiststext += data.artists[j].name; artiststext += data.track.artists[j].name;
if (j != data.artists.length - 1) { if (j != data.track.artists.length - 1) {
artistshtml += ', '; artistshtml += ', ';
artiststext += ', '; artiststext += ', ';
} }
} }
arttmp = artistshtml; arttmp = artistshtml;
} }
if (data.album && data.album.name) { if (data.track.album && data.track.album.name) {
$("#modalalbum").html('<a href="#" onclick="return showAlbum(\'' + data.album.uri + '\');">' + data.album.name + '</a>'); $("#modalalbum").html('<a href="#" onclick="return showAlbum(\'' + data.track.album.uri + '\');">' + data.track.album.name + '</a>');
getCover(data.album, '#infocover, #controlspopupimage', 'extralarge'); getCover(data.track.album, '#infocover, #controlspopupimage', 'extralarge');
} else { } else {
$("#modalalbum").html(''); $("#modalalbum").html('');
$("#infocover").attr('src', 'images/default_cover.png'); $("#infocover").attr('src', 'images/default_cover.png');
@ -133,7 +135,7 @@ function setSongInfo(data) {
$("#modalartist").html(arttmp); $("#modalartist").html(arttmp);
$("#trackslider").attr("min", 0); $("#trackslider").attr("min", 0);
$("#trackslider").attr("max", data.length); $("#trackslider").attr("max", data.track.length);
resizeMb(); resizeMb();
} }
@ -150,7 +152,7 @@ function closePopups() {
} }
function popupTracks(e, listuri, trackuri) { function popupTracks(e, listuri, trackuri, tlid) {
if (!e) if (!e)
var e = window.event; var e = window.event;
$('.popupTrackName').html(popupData[trackuri].name); $('.popupTrackName').html(popupData[trackuri].name);
@ -192,10 +194,18 @@ function popupTracks(e, listuri, trackuri) {
var popupName = '#popupTracks'; var popupName = '#popupTracks';
} }
if (typeof tlid != 'undefined' && tlid != '') {
$(popupName).data("list", listuri).data("track", trackuri).data("tlid", tlid).popup("open", {
x : e.pageX,
y : e.pageY
});
} else {
$(popupName).data("list", listuri).data("track", trackuri).popup("open", { $(popupName).data("list", listuri).data("track", trackuri).popup("open", {
x : e.pageX, x : e.pageX,
y : e.pageY y : e.pageY
}); });
}
return false; return false;
} }
@ -230,12 +240,12 @@ function initSocketevents() {
mopidy.on("event:trackPlaybackStarted", function(data) { mopidy.on("event:trackPlaybackStarted", function(data) {
mopidy.playback.getTimePosition().then(processCurrentposition, console.error); mopidy.playback.getTimePosition().then(processCurrentposition, console.error);
setPlayState(true); setPlayState(true);
setSongInfo(data.tl_track.track); setSongInfo(data.tl_track);
initPosTimer(); initPosTimer();
}); });
mopidy.on("event:trackPlaybackPaused", function(data) { mopidy.on("event:trackPlaybackPaused", function(data) {
//setSongInfo(data.tl_track.track); //setSongInfo(data.tl_track);
pausePosTimer(); pausePosTimer();
setPlayState(false); setPlayState(false);
}); });
@ -338,7 +348,7 @@ function setHeadline(site){
//update timer //update timer
function updateStatusTimer() { function updateStatusTimer() {
// console.log('statustimer'); // console.log('statustimer');
mopidy.playback.getCurrentTrack().then(processCurrenttrack, console.error); mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error);
mopidy.playback.getTimePosition().then(processCurrentposition, console.error); mopidy.playback.getTimePosition().then(processCurrentposition, console.error);
//TODO check offline? //TODO check offline?
} }
@ -353,7 +363,7 @@ function updateOptions() {
//update everything as if reloaded //update everything as if reloaded
function updateStatusOfAll() { function updateStatusOfAll() {
mopidy.playback.getCurrentTrack().then(processCurrenttrack, console.error); mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error);
mopidy.playback.getTimePosition().then(processCurrentposition, console.error); mopidy.playback.getTimePosition().then(processCurrentposition, console.error);
mopidy.playback.getState().then(processPlaystate, console.error); mopidy.playback.getState().then(processPlaystate, console.error);
@ -567,10 +577,14 @@ $(document).ready(function(event) {
} ); } );
}); });
function updatePlayIcons (uri) { function updatePlayIcons (uri, tlid) {
//update styles of listviews //update styles of listviews
$('#currenttable li').each(function() { $('#currenttable li').each(function() {
if (this.id == 'currenttable-' + uri) { var eachTlid = $(this).attr('tlid');
if (typeof eachTlid != 'undefined') {
eachTlid = parseInt(eachTlid);
}
if (this.id == 'currenttable-' + uri && eachTlid == tlid) {
$(this).addClass('currenttrack'); $(this).addClass('currenttrack');
} else { } else {
$(this).removeClass("currenttrack"); $(this).removeClass("currenttrack");

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

@ -199,7 +199,6 @@ function processSearchResults(resultArr) {
// playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache'); // playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache'); resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
setSongInfo();
showLoading(false); showLoading(false);
} }
@ -230,7 +229,7 @@ function getBrowseDir(rootdir) {
} }
function getCurrentPlaylist() { function getCurrentPlaylist() {
mopidy.tracklist.getTracks().then(processCurrentPlaylist, console.error); mopidy.tracklist.getTlTracks().then(processCurrentPlaylist, console.error);
} }
/******************************************************** /********************************************************
@ -292,7 +291,6 @@ function showArtist(nwuri) {
}, console.error); }, console.error);
switchContent('artists', nwuri); switchContent('artists', nwuri);
scrollToTop(); scrollToTop();
setSongInfo();
return false; return false;
} }
@ -329,7 +327,6 @@ function showAlbum(uri) {
//show page //show page
switchContent('albums', uri); switchContent('albums', uri);
scrollToTop(); scrollToTop();
setSongInfo();
return false; return false;
} }

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

@ -144,7 +144,7 @@ function processBrowseDir(resultArr) {
$('#browsepath').html(''); $('#browsepath').html('');
} }
updatePlayIcons(songdata.uri); updatePlayIcons(songdata.track.uri, songdata.tlid);
showLoading(false); showLoading(false);
} }
@ -194,7 +194,6 @@ function processGetTracklist(resultArr) {
var newplaylisturi = resultArr.uri; var newplaylisturi = resultArr.uri;
//console.log(resultArr); //console.log(resultArr);
playlists[newplaylisturi] = resultArr; playlists[newplaylisturi] = resultArr;
setSongInfo();
resultsToTables(playlists[newplaylisturi].tracks, PLAYLIST_TABLE, newplaylisturi); resultsToTables(playlists[newplaylisturi].tracks, PLAYLIST_TABLE, newplaylisturi);
showLoading(false); showLoading(false);
} }
@ -204,9 +203,9 @@ function processGetTracklist(resultArr) {
*********************************************************/ *********************************************************/
function processCurrentPlaylist(resultArr) { function processCurrentPlaylist(resultArr) {
currentplaylist = resultArr; currentplaylist = resultArr;
resultsToTables(resultArr, CURRENT_PLAYLIST_TABLE); resultsToTables(currentplaylist, CURRENT_PLAYLIST_TABLE);
mopidy.playback.getCurrentTrack().then(processCurrenttrack, console.error); mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error);
updatePlayIcons(songdata.uri); updatePlayIcons(songdata.track.uri, songdata.tlid);
} }
/******************************************************** /********************************************************
@ -225,7 +224,6 @@ function processArtistResults(resultArr) {
var artistname = getArtist(resultArr); var artistname = getArtist(resultArr);
$('#h_artistname, #artistpopupname').html(artistname); $('#h_artistname, #artistpopupname').html(artistname);
getArtistImage(artistname, '#artistviewimage, #artistpopupimage', 'extralarge'); getArtistImage(artistname, '#artistviewimage, #artistpopupimage', 'extralarge');
setSongInfo();
showLoading(false); showLoading(false);
} }
@ -248,7 +246,6 @@ function processAlbumResults(resultArr) {
$('#h_albumartist').html(artistname); $('#h_albumartist').html(artistname);
$('#coverpopupalbumname').html(albumname); $('#coverpopupalbumname').html(albumname);
$('#coverpopupartist').html(artistname); $('#coverpopupartist').html(artistname);
setSongInfo();
getCover(resultArr[0].album, '#albumviewcover, #coverpopupimage', 'extralarge'); getCover(resultArr[0].album, '#albumviewcover, #coverpopupimage', 'extralarge');
showLoading(false); showLoading(false);
} }