From 4ec547a66ac24561fb1e58f9f9b4f76a031ccf08 Mon Sep 17 00:00:00 2001
From: jcass <john.cass77@gmail.com>
Date: Sun, 31 Jan 2016 17:34:45 +0200
Subject: [PATCH] Refactor URI lookup routines.

---
 mopidy_musicbox_webclient/static/js/library.js    |  6 +++---
 mopidy_musicbox_webclient/static/js/process_ws.js | 10 +++++-----
 mopidy_musicbox_webclient/static/mb.manifest      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js
index f399ba4..4ff0caf 100644
--- a/mopidy_musicbox_webclient/static/js/library.js
+++ b/mopidy_musicbox_webclient/static/js/library.js
@@ -267,7 +267,7 @@ function showArtist(nwuri) {
     $('#h_artistname').html('');
     showLoading(true);
     mopidy.library.lookup({'uris': [nwuri]}).then(function(resultDict) {
-        var resultArr = resultDict[Object.keys(resultDict)[0]];
+        var resultArr = resultDict[nwuri];
         resultArr.uri = nwuri;
         processArtistResults(resultArr);
     }, console.error);
@@ -293,7 +293,7 @@ function showAlbum(uri) {
         $('#coverpopupartist').html(artistname);
         showLoading(false);
         mopidy.library.lookup({'uris': [uri]}).then(function(resultDict) {
-            var resultArr = resultDict[Object.keys(resultDict)[0]];
+            var resultArr = resultDict[uri];
             resultArr.uri = uri;
             processAlbumResults(resultArr);
         }, console.error);
@@ -302,7 +302,7 @@ function showAlbum(uri) {
         $('#h_albumname').html('');
         $('#h_albumartist').html('');
         mopidy.library.lookup({'uris': [uri]}).then(function(resultDict) {
-            var resultArr = resultDict[Object.keys(resultDict)[0]];
+            var resultArr = resultDict[uri];
             resultArr.uri = uri;
             processAlbumResults(resultArr);
         }, console.error);
diff --git a/mopidy_musicbox_webclient/static/js/process_ws.js b/mopidy_musicbox_webclient/static/js/process_ws.js
index 2479df2..ef6ec6a 100644
--- a/mopidy_musicbox_webclient/static/js/process_ws.js
+++ b/mopidy_musicbox_webclient/static/js/process_ws.js
@@ -119,9 +119,9 @@ function processBrowseDir(resultArr) {
         if (resultArr[i].type == 'track') {
             //console.log(resultArr[i]);
             mopidy.library.lookup({'uris': [resultArr[i].uri]}).then(function (resultDict) {
-                var uri = Object.keys(resultDict)[0];
-                popupData[uri] = resultDict[uri][0];
-                browseTracks.push(resultDict[uri][0]);
+                var lookup_uri = Object.keys(resultDict)[0];
+                popupData[lookup_uri] = resultDict[lookup_uri][0];
+                browseTracks.push(resultDict[lookup_uri][0]);
             }, console.error);
             child += '<li class="song albumli" id="browselisttracks-' + resultArr[i].uri + '">' +
                      '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\', \'' + resultArr[i].uri + '\', \'' + index + '\');">' +
@@ -140,8 +140,8 @@ function processBrowseDir(resultArr) {
 
     $('#browselist').html(child);
     if (browseStack.length > 0 ) {
-        child = getMediaHuman(resultArr[0].uri);
-        iconClass = getMediaClass(resultArr[0].uri);
+        child = getMediaHuman(uri);
+        iconClass = getMediaClass(uri);
         $('#browsepath').html('<i class="' + iconClass + '"></i> ' + child);
     } else {
         $('#browsepath').html('');
diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest
index 3ea6ab1..eac72d0 100644
--- a/mopidy_musicbox_webclient/static/mb.manifest
+++ b/mopidy_musicbox_webclient/static/mb.manifest
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2016-01-31:v1
+# 2016-01-31:v2
 
 NETWORK:
 *