From 47b45dffa9ef9b052f62479154e22705a8149694 Mon Sep 17 00:00:00 2001
From: wagamama <wagamama.tsai@gmail.com>
Date: Thu, 26 Mar 2015 09:42:24 +0800
Subject: [PATCH] Refine code

---
 mopidy_musicbox_webclient/static/js/functionsvars.js | 7 +------
 mopidy_musicbox_webclient/static/js/gui.js           | 6 +++---
 mopidy_musicbox_webclient/static/js/library.js       | 3 ---
 mopidy_musicbox_webclient/static/js/process_ws.js    | 3 ---
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js
index a6ce723..c24944e 100644
--- a/mopidy_musicbox_webclient/static/js/functionsvars.js
+++ b/mopidy_musicbox_webclient/static/js/functionsvars.js
@@ -223,14 +223,9 @@ function resultsToTables(results, target, uri) {
     }
     var tlids = [];
     if (target == CURRENT_PLAYLIST_TABLE) {
-        var tmp = [];
         for (i = 0; i < results.length; i++) {
-            tmp[i] = results[i].track;
             tlids[i] = results[i].tlid;
-        }
-        results = [];
-        for (i = 0; i < tmp.length; i++) {
-            results[i] = tmp[i];
+            results[i] = results[i].track;
         }
     }
 
diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
index d0f2443..3acfbcb 100644
--- a/mopidy_musicbox_webclient/static/js/gui.js
+++ b/mopidy_musicbox_webclient/static/js/gui.js
@@ -102,8 +102,8 @@ function setSongInfo(data) {
         $("#songlength").html('');
         pausePosTimer();
         $('#trackslider').slider('disable');
-        // $('#streamnameinput').val(data['track'].name);
-        // $('#streamuriinput').val(data['track'].uri);
+        // $('#streamnameinput').val(data.track.name);
+        // $('#streamuriinput').val(data.track.uri);
     } else {
         songlength = data.track.length;
         $("#songlength").html(timeFromSeconds(data.track.length / 1000));
@@ -123,7 +123,7 @@ function setSongInfo(data) {
 	}
         arttmp = artistshtml;
     }
-    if (data.track.album && data['track'].album.name) {
+    if (data.track.album && data.track.album.name) {
         $("#modalalbum").html('<a href="#" onclick="return showAlbum(\'' + data.track.album.uri + '\');">' + data.track.album.name + '</a>');
         getCover(data.track.album, '#infocover, #controlspopupimage', 'extralarge');
     } else {
diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js
index 20bd57c..f149d86 100644
--- a/mopidy_musicbox_webclient/static/js/library.js
+++ b/mopidy_musicbox_webclient/static/js/library.js
@@ -199,7 +199,6 @@ function processSearchResults(resultArr) {
 //    playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
     resultsToTables(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache');
 
-    // setSongInfo();
     showLoading(false);
 }
 
@@ -292,7 +291,6 @@ function showArtist(nwuri) {
     }, console.error);
     switchContent('artists', nwuri);
     scrollToTop();
-    // setSongInfo();
     return false;
 }
 
@@ -329,7 +327,6 @@ function showAlbum(uri) {
     //show page
     switchContent('albums', uri);
     scrollToTop();
-    // setSongInfo();
     return false;
 }
 
diff --git a/mopidy_musicbox_webclient/static/js/process_ws.js b/mopidy_musicbox_webclient/static/js/process_ws.js
index 566d1b0..c8e0d31 100644
--- a/mopidy_musicbox_webclient/static/js/process_ws.js
+++ b/mopidy_musicbox_webclient/static/js/process_ws.js
@@ -194,7 +194,6 @@ function processGetTracklist(resultArr) {
     var newplaylisturi = resultArr.uri;
 //console.log(resultArr);
     playlists[newplaylisturi] = resultArr;
-    // setSongInfo();
     resultsToTables(playlists[newplaylisturi].tracks, PLAYLIST_TABLE, newplaylisturi);
     showLoading(false);
 }
@@ -225,7 +224,6 @@ function processArtistResults(resultArr) {
     var artistname = getArtist(resultArr);
     $('#h_artistname, #artistpopupname').html(artistname);
     getArtistImage(artistname, '#artistviewimage, #artistpopupimage', 'extralarge');
-    // setSongInfo();
     showLoading(false);
 }
 
@@ -248,7 +246,6 @@ function processAlbumResults(resultArr) {
     $('#h_albumartist').html(artistname);
     $('#coverpopupalbumname').html(albumname);
     $('#coverpopupartist').html(artistname);
-    // setSongInfo();
     getCover(resultArr[0].album, '#albumviewcover, #coverpopupimage', 'extralarge');
     showLoading(false);
 }