From b4a780ad5a4499178d3e34a734f55c9d82e5711a Mon Sep 17 00:00:00 2001 From: wagamama Date: Sat, 11 Apr 2015 13:14:31 +0800 Subject: [PATCH] Keep track of browsing tracks Store browsing tracks in global "browseTracks" for playing all tracks --- mopidy_musicbox_webclient/static/js/controls.js | 2 +- mopidy_musicbox_webclient/static/js/functionsvars.js | 1 + mopidy_musicbox_webclient/static/js/process_ws.js | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js index 7353dfa..7d0abab 100644 --- a/mopidy_musicbox_webclient/static/js/controls.js +++ b/mopidy_musicbox_webclient/static/js/controls.js @@ -41,9 +41,9 @@ function playBrowsedTracks(addtoqueue, trackid) { if (this.id == trackid) { selected = counter; } - mopidy.tracklist.add(null, null, this.id); counter++; }); + mopidy.tracklist.add(browseTracks); break; default: break; diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js index 6d1f995..85829d8 100644 --- a/mopidy_musicbox_webclient/static/js/functionsvars.js +++ b/mopidy_musicbox_webclient/static/js/functionsvars.js @@ -47,6 +47,7 @@ var customPlaylists = []; var customTracklists = []; var browseStack = []; +var browseTracks = []; var ua = navigator.userAgent, isMobileSafari = /Mac/.test(ua) && /Mobile/.test(ua), diff --git a/mopidy_musicbox_webclient/static/js/process_ws.js b/mopidy_musicbox_webclient/static/js/process_ws.js index b7a899a..8b9c357 100644 --- a/mopidy_musicbox_webclient/static/js/process_ws.js +++ b/mopidy_musicbox_webclient/static/js/process_ws.js @@ -106,12 +106,14 @@ function processBrowseDir(resultArr) { child += backHtml; } + browseTracks = []; for (var i = 0; i < resultArr.length; i++) { iconClass = getMediaClass(resultArr[i].uri); if(resultArr[i].type == 'track' ) { // console.log(resultArr[i]); mopidy.library.lookup(resultArr[i].uri).then(function (resultArr) { popupData[resultArr[0].uri] = resultArr[0]; + browseTracks.push(resultArr[0]); }, console.error); child += '
  • ' + '' +