From bd703c975d436dafa1f09fa93877b4b5f3db2d31 Mon Sep 17 00:00:00 2001 From: jcass Date: Thu, 18 Feb 2016 13:01:05 +0200 Subject: [PATCH] Display 'Trying to reach Musicbox.' message when initial connection to Mopidy fails. Rename .manifest to .appcache to align with standards. --- mopidy_musicbox_webclient/static/index.html | 10 ++++------ mopidy_musicbox_webclient/static/js/gui.js | 18 +++++++++++++----- .../static/{mb.manifest => mb.appcache} | 4 ++-- 3 files changed, 19 insertions(+), 13 deletions(-) rename mopidy_musicbox_webclient/static/{mb.manifest => mb.appcache} (99%) diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html index c19b24c..0be317b 100644 --- a/mopidy_musicbox_webclient/static/index.html +++ b/mopidy_musicbox_webclient/static/index.html @@ -1,5 +1,5 @@ - + @@ -30,15 +30,13 @@ - + - - @@ -48,8 +46,8 @@ - - + + diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index 2a8d4f1..e0f50f3 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -462,12 +462,20 @@ $(document).ready(function(event) { // Connect to server if (websocketUrl) { - mopidy = new Mopidy({ - webSocketUrl: websocketUrl, // wslocation is set in index.html from the extention config. - callingConvention: 'by-position-or-by-name' - }); + try { + mopidy = new Mopidy({ + webSocketUrl: websocketUrl, + callingConvention: 'by-position-or-by-name' + }); + } catch (e) { + showOffline(true); + } } else { - mopidy = new Mopidy({callingConvention: 'by-position-or-by-name'}); + try { + mopidy = new Mopidy({callingConvention: 'by-position-or-by-name'}); + } catch (e) { + showOffline(true); + } } //initialize events diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.appcache similarity index 99% rename from mopidy_musicbox_webclient/static/mb.manifest rename to mopidy_musicbox_webclient/static/mb.appcache index 90ed35c..49bd417 100644 --- a/mopidy_musicbox_webclient/static/mb.manifest +++ b/mopidy_musicbox_webclient/static/mb.appcache @@ -1,6 +1,6 @@ CACHE MANIFEST -# 2016-02-18:v1 +# 2016-02-18:v2 NETWORK: * @@ -27,7 +27,7 @@ js/images.js js/library.js js/process_ws.js js/progress_timer.js -mb.manifest +mb.appcache system.html vendors/font_awesome/css/font-awesome.css vendors/font_awesome/css/font-awesome.min.css