From bace97cc7c17d7856fdc0f32aa435d12eb68fb79 Mon Sep 17 00:00:00 2001
From: Nick Steel <kingosticks@gmail.com>
Date: Thu, 12 Nov 2015 01:24:39 +0000
Subject: [PATCH] Refactor playlist from URI helper function to return tracks.

---
 .../static/js/functionsvars.js                      | 13 +++++--------
 mopidy_musicbox_webclient/static/js/library.js      |  7 ++++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js
index 6cd6190..32753e4 100644
--- a/mopidy_musicbox_webclient/static/js/functionsvars.js
+++ b/mopidy_musicbox_webclient/static/js/functionsvars.js
@@ -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) {
diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js
index 71024ee..2fc935f 100644
--- a/mopidy_musicbox_webclient/static/js/library.js
+++ b/mopidy_musicbox_webclient/static/js/library.js
@@ -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);
     }