From 2d4b59279ff131813fac3fdb9c5ed3367f520e01 Mon Sep 17 00:00:00 2001
From: Egor <hoboman313@gmail.com>
Date: Sat, 31 Oct 2015 00:09:47 -0700
Subject: [PATCH] bug fixes

---
 app/pods/components/huegasm-app/component.js | 15 +++++++++------
 app/pods/components/music-tab/template.hbs   |  5 ++++-
 app/styles/app.scss                          | 14 +++++++++++++-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/pods/components/huegasm-app/component.js b/app/pods/components/huegasm-app/component.js
index 926abf6..db9d6da 100644
--- a/app/pods/components/huegasm-app/component.js
+++ b/app/pods/components/huegasm-app/component.js
@@ -46,12 +46,15 @@ export default Em.Component.extend({
     var storage = new window.Locally.Store({ compress: true });
     this.set('storage', storage);
 
-    ['bridgeIp', 'bridgeUsername', 'dimmerOn'].forEach((item) => {
-      var storedValue = storage.get('huegasm.' + item);
+    if(!Em.isNone(storage.get('huegasm.dimmerOn'))) {
+      this.set('dimmerOn', storage.get('huegasm.dimmerOn'));
+    }
 
-      if(storedValue) {
-        this.set(item, storage.get('huegasm.' + item));
-      }
-    });
+    if(!Em.isNone(storage.get('huegasm.bridgeIp')) && !Em.isNone(storage.get('huegasm.bridgeUsername'))) {
+      this.setProperties({
+        bridgeIp: storage.get('huegasm.bridgeIp'),
+        bridgeUsername: storage.get('huegasm.bridgeUsername')
+      });
+    }
   }
 });
diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index 93e7c65..a4a0360 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -63,7 +63,7 @@
     </ul>
 
     {{#if playQueueNotEmpty}}
-        <div id="extraOptionsMenu">
+        <div id="extraOptionsMenu" class="hidden-xs">
             <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span>
             <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="repeatTooltip" data-title={{repeatTooltipTxt}} {{action "repeatChanged"}}>{{paper-icon icon=repeatIcon class=repeatClass}}</span>
             <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" data-title="Clear playlist" {{action "clearPlaylist"}}>{{paper-icon icon="clear-all" class="playerControllIcon"}}</span>
@@ -71,6 +71,9 @@
     {{/if}}
   {{/if}}
 
+    <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span>
+    <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" id="repeatTooltip" data-title={{repeatTooltipTxt}} {{action "repeatChanged"}}>{{paper-icon icon=repeatIcon class=repeatClass}}</span>
+    <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" data-title="Clear playlist" {{action "clearPlaylist"}}>{{paper-icon icon="clear-all" class="playerControllIcon"}}</span>
   {{#if usingMicSupported}}
     <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="usingMicAudioTooltip" data-title={{usingMicAudioTooltipTxt}} {{action "useMicAudio"}}>{{paper-icon icon=micIcon class=usingMicAudioClass}}</span>
   {{/if}}
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 50c7441..b900679 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -137,6 +137,12 @@ md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-sli
   padding-top: 20px;
 }
 
+// preloading image
+.readyBlock:after {
+  display: none;
+  content: url(images/pressButtonBridge.png);
+}
+
 .title {
   font-size: 30px;
   margin-bottom: 30px;
@@ -217,10 +223,15 @@ md-list-item .md-no-style {
 
 #hueControls {
   max-width: 1200px;
-  min-width: 400px;
   position: relative;
 }
 
+// preload images
+#hueControls:after, md-progress-circular:after {
+  display: none;
+  content: url(images/colormap.png) url(images/missingArtwork.png) url(images/sc-white.png) url(images/favicons/favicon-90x90.png) url(images/lights/a19.svg) url(images/lights/a19w.svg) url(images/lights/br30.svg) url(images/lights/br30w.svg) url(images/lights/gu10.svg) url(images/lights/gu10w.svg) url(images/lights/huego.svg) url(images/lights/huegow.svg) url(images/lights/lc_aura.svg) url(images/lights/lc_auraw.svg) url(images/lights/lc_bloom.svg) url(images/lights/lc_bloomw.svg) url(images/lights/lc_iris.svg) url(images/lights/lc_irisw.svg) url(images/lights/lightstrip.svg) url(images/lights/lightstripw.svg) url(images/lights/storylight.svg) url(images/lights/storylightw.svg);
+}
+
 .navigation {
   text-align: center;
   padding: 30px 0;
@@ -464,6 +475,7 @@ md-toolbar {
 
 #musicTab{
   padding: 0;
+  margin-bottom: $footerHeight + 50px;
 }
 
 #slideToggle {