' +
+ ' ' + newalbum[0].name + "
";
+ }
+
/* '' + timeFromSeconds(newalbum[0].length / 1000) + ''; */
if (newalbum[0].artists) {
for (j = 0; j < newalbum[0].artists.length; j++) {
@@ -288,6 +323,7 @@ function resultsToTables(results, target, uri) {
popupData[newalbum[0].uri] = newalbum[0];
newalbum = [];
+ newtlids = [];
} else { //newalbum length
if (results[i].album.uri && results[i].album.name) {
// iconClass = getMediaClass(results[i].album.uri);
@@ -314,12 +350,17 @@ function resultsToTables(results, target, uri) {
//hERE!
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 += '
';
//html += '' + timeFromSeconds(newalbum[j].length / 1000) + '
' + newalbum[j].name + '
';
}
newalbum = [];
+ newtlids = [];
if (results[i].album) {
coversList.push([results[i].album, i]);
}
diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
index 82d2b96..c7f9654 100644
--- a/mopidy_musicbox_webclient/static/js/gui.js
+++ b/mopidy_musicbox_webclient/static/js/gui.js
@@ -12,16 +12,18 @@ function resetSong() {
setPlayState(false);
setPosition(0);
var data = new Object;
- data.name = '';
- data.artists = '';
- data.length = 0;
- data.uri = ' ';
+ data.tlid = -1;
+ data.track = new Object;
+ data.track.name = '';
+ data.track.artists = '';
+ data.track.length = 0;
+ data.track.uri = ' ';
setSongInfo(data);
}
}
function resizeMb() {
- $("#infoname").html(songdata.name);
+ $("#infoname").html(songdata.track.name);
$("#infoartist").html(artiststext);
if ($(window).width() <= 960) {
@@ -72,69 +74,69 @@ function resizeMb() {
function setSongInfo(data) {
// console.log(data, songdata);
if (!data ) { return; }
- if ( (data.uri == songdata.uri) ) { return;}
- if (!data.name || data.name == '') {
- var name = data.uri.split('/');
- data.name = decodeURI(name[name.length - 1]);
+ if (data.tlid == songdata.tlid) { return; }
+ if (!data.track.name || data.track.name == '') {
+ var name = data.track.uri.split('/');
+ data.track.name = decodeURI(name[name.length - 1]);
};
- updatePlayIcons(data.uri);
+ updatePlayIcons(data.track.uri, data.tlid);
artistshtml = '';
artiststext = '';
- if (validUri(data.name)) {
+ if (validUri(data.track.name)) {
for (var key in streamUris) {
- rs = streamUris[key];
- if (rs && rs[1] == data.name) {
- data.name = (rs[0] || rs[1]);
- }
- };
+ rs = streamUris[key];
+ if (rs && rs[1] == data.track.name) {
+ data.track.name = (rs[0] || rs[1]);
+ }
+ };
}
-
+
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").html('');
- pausePosTimer();
- $('#trackslider').slider('disable');
-// $('#streamnameinput').val(data.name);
-// $('#streamuriinput').val(data.uri);
+ $("#songlength").html('');
+ pausePosTimer();
+ $('#trackslider').slider('disable');
+ // $('#streamnameinput').val(data['track'].name);
+ // $('#streamuriinput').val(data['track'].uri);
} else {
- songlength = data.length;
- $("#songlength").html(timeFromSeconds(data.length / 1000));
+ songlength = data.track.length;
+ $("#songlength").html(timeFromSeconds(data.track.length / 1000));
$('#trackslider').slider('enable');
}
var arttmp = '';
-
- if(data.artists) {
- for (var j = 0; j < data.artists.length; j++) {
- artistshtml += '