From 567877f8587e8d1c58379c16fd7085767f8c24d8 Mon Sep 17 00:00:00 2001
From: jcass <john.cass77@gmail.com>
Date: Sun, 29 Jan 2017 12:49:11 +0200
Subject: [PATCH] Verify popup ID parameter before close.

---
 .../static/js/controls.js                     | 19 +++++++++----------
 mopidy_musicbox_webclient/static/mb.appcache  |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index 4fe13fe..0a01472 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -341,7 +341,9 @@
         showInfoPopup: function (uri, popupId, mopidy) {
             showLoading(true)
             var trackUri = uri || $(popupId).data('track')
-            $(popupId).popup('close')
+            if (popupId && popupId.length > 0) {
+                $(popupId).popup('close')
+            }
             $('#popupShowInfo tbody').empty()
 
             mopidy.library.lookup({'uris': [trackUri]}).then(function (resultDict) {
@@ -374,10 +376,9 @@
                 }
 
                 if (artists.length > 0) {
+                    row.label = 'Artist'
                     if (track.artists && track.artists.length > 1 || track.album && track.album.artists && track.album.artists.length > 1) {
-                        row.label = 'Artists'
-                    } else {
-                        row.label = 'Artist'
+                        row.label += 's'
                     }
                     row.text = artists
                     html += stringFromTemplate(rowTemplate, row)
@@ -385,10 +386,9 @@
 
                 var composers = artistsToString(track.composers)
                 if (composers.length > 0) {
+                    row.label = 'Composer'
                     if (track.composers.length > 1) {
-                        row.label = 'Composers'
-                    } else {
-                        row.label = 'Composer'
+                        row.label += 's'
                     }
                     row.text = composers
                     html += stringFromTemplate(rowTemplate, row)
@@ -396,10 +396,9 @@
 
                 var performers = artistsToString(track.performers)
                 if (performers.length > 0) {
+                    row.label = 'Performer'
                     if (track.performers.length > 1) {
-                        row.label = 'Performers'
-                    } else {
-                        row.label = 'Performer'
+                        row.label += 's'
                     }
                     row.text = performers
                     html += stringFromTemplate(rowTemplate, row)
diff --git a/mopidy_musicbox_webclient/static/mb.appcache b/mopidy_musicbox_webclient/static/mb.appcache
index 0b387a7..d23a9f2 100644
--- a/mopidy_musicbox_webclient/static/mb.appcache
+++ b/mopidy_musicbox_webclient/static/mb.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2017-01-29:v3
+# 2017-01-29:v4
 
 NETWORK:
 *