From 43c7733e73760c374f27dd1c871bd0a9cd1ae45c Mon Sep 17 00:00:00 2001
From: Nick Steel <kingosticks@gmail.com>
Date: Tue, 23 Jun 2015 16:30:47 +0100
Subject: [PATCH] Static client support. (Fixes #105).

---
 mopidy_musicbox_webclient/static/index.html | 6 +++---
 mopidy_musicbox_webclient/web.py            | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html
index 2310738..532e9a3 100644
--- a/mopidy_musicbox_webclient/static/index.html
+++ b/mopidy_musicbox_webclient/static/index.html
@@ -8,9 +8,9 @@
 <!--    <script type='application/javascript' src='js/fastclick.js'></script> -->
     <script>
         //configuration
-        var isMusicBox = {{musicbox}}; // Remove MusicBox only content (e.g. settings, system pages)
-        var websocketUrl = '{{websocket_url}}';
-        var hasAlarmClock = {{alarmclock}}; // Add Alarm Clock icons
+        var isMusicBox = '{{musicbox}}' == 'True'; // Remove MusicBox only content (e.g. settings, system pages)
+        var websocketUrl = ('{{useWebsocketUrl}}' == 'True') ? '{{websocket_url}}' : ''
+        var hasAlarmClock = '{{alarmclock}}' == 'True'; // Add Alarm Clock icons
 
         $(document).bind("mobileinit", function () {
             $.extend($.mobile, {
diff --git a/mopidy_musicbox_webclient/web.py b/mopidy_musicbox_webclient/web.py
index dcdf707..5ec3e21 100644
--- a/mopidy_musicbox_webclient/web.py
+++ b/mopidy_musicbox_webclient/web.py
@@ -43,11 +43,10 @@ class IndexHandler(tornado.web.RequestHandler):
 
         self.__dict = {
             'version': MusicBoxExtension.version,
-            'musicbox': int(ext_config['musicbox'] or False),
+            'musicbox': ext_config.get('musicbox', False),
+            'useWebsocketUrl': ws_url != '',
             'websocket_url': ws_url,
-            'alarmclock': int('alarmclock' in config and
-                              'enabled' in config['alarmclock'] and
-                              config['alarmclock']['enabled'])
+            'alarmclock': config.get('alarmclock', {}).get('enabled', False),
         }
         self.__path = path