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

Refactor playlist from URI helper function to return tracks.

Browse Source
This commit is contained in:
Nick Steel 2015-11-12 01:24:39 +00:00
parent c0d89b7437
commit bace97cc7c
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,9 +423,9 @@ function playlisttotable(pl, target, uri) {
$(target).attr('data', uri);
}
function getPlaylistFromUri(uri) {
if (playlists[uri]) {
return playlists[uri];
function getPlaylistTracks(uri) {
if (playlists[uri] && playlists[uri].tracks) {
return playlists[uri].tracks;
}
}
@ -439,11 +439,8 @@ function getUris(tracks) {
function getTracksFromUri(uri, full_track_data) {
full_track_data = full_track_data || false;
var pl = getPlaylistFromUri(uri);
var tracks = [];
if (pl) {
tracks = pl.tracks;
} else if (customTracklists[uri]) {
var tracks = getPlaylistTracks(uri);
if (!tracks && customTracklists[uri]) {
tracks = customTracklists[uri];
}
if (full_track_data) {

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

@ -250,10 +250,11 @@ function togglePlaylists() {
function showTracklist(uri) {
$(PLAYLIST_TABLE).empty();
togglePlaylists();
var pl = getPlaylistFromUri(uri);
var tracks = getPlaylistTracks(uri);
//load from cache
if (pl) {
resultsToTables(pl.tracks, PLAYLIST_TABLE, uri);
if (tracks) {
resultsToTables(tracks, PLAYLIST_TABLE, uri);
return;
} else {
showLoading(true);
}