From c19419da2b33190b155d1f05e6173f82f81af0d3 Mon Sep 17 00:00:00 2001
From: Egor <hoboman313@gmail.com>
Date: Fri, 9 Oct 2015 00:36:46 -0700
Subject: [PATCH] bug fixes

---
 app/pods/components/hue-controls/component.js     | 4 +++-
 app/pods/components/music-tab/component.js        | 4 ++--
 app/pods/components/music-tab/mixins/music-tab.js | 2 +-
 app/styles/app.scss                               | 6 +++++-
 bower.json                                        | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/pods/components/hue-controls/component.js b/app/pods/components/hue-controls/component.js
index 9026e14..0ef48c9 100644
--- a/app/pods/components/hue-controls/component.js
+++ b/app/pods/components/hue-controls/component.js
@@ -138,8 +138,10 @@ export default Em.Component.extend({
     };
 
     Em.$.get(this.get('apiURL') + '/lights', function (result, status) {
-      if (status === 'success' && JSON.stringify(self.get('lightsData')) !== JSON.stringify(result) ) {
+      if (status === 'success' && Em.isNone(result[0])) {
         self.set('lightsData', result);
+      } else {
+        fail();
       }
     }).fail(fail);
   },
diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js
index 73ee10c..93347c5 100644
--- a/app/pods/components/music-tab/component.js
+++ b/app/pods/components/music-tab/component.js
@@ -453,12 +453,12 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
         light;
 
       if(randomTransition) {
-        lightBopIndex = Math.floor(Math.random() * activeLights.length) + 1;
+        lightBopIndex = Math.floor(Math.random() * activeLights.length);
 
         // let's try not to select the same light twice in a row
         if(activeLights.length > 1) {
           while(lightBopIndex === lastLightBopIndex) {
-            lightBopIndex = Math.floor(Math.random() * activeLights.length) + 1;
+            lightBopIndex = Math.floor(Math.random() * activeLights.length);
           }
         }
       } else {
diff --git a/app/pods/components/music-tab/mixins/music-tab.js b/app/pods/components/music-tab/mixins/music-tab.js
index 21c1a18..2a1dc08 100644
--- a/app/pods/components/music-tab/mixins/music-tab.js
+++ b/app/pods/components/music-tab/mixins/music-tab.js
@@ -257,7 +257,7 @@ export default Em.Mixin.create({
 
     this.$('#dimmer').fadeTo(400, opacity, function() {
       if(opacity === 0) {
-        $(this).hide();
+        Em.$(this).hide();
       }
     });
   }.observes('dimmerOn'),
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 00530fe..e8caff1 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -405,7 +405,7 @@ md-toolbar {
 
 #slideToggle {
   color: $playerDefaultIconColor;
-  background: #8C3E3E;
+  background: #730B07;
   div md-icon {
     color: inherit !important;
   }
@@ -967,3 +967,7 @@ $vibrateblurouter: 2px;
   color: #F12B24 !important;
   font-size: 30px;
 }
+
+.md-warn {
+  background: $secondaryThemeColor;
+}
diff --git a/bower.json b/bower.json
index bb751da..2a01613 100644
--- a/bower.json
+++ b/bower.json
@@ -15,7 +15,7 @@
     "jquery": "~2.1.4",
     "jquery-mousewheel": "~3.1.13",
     "loader.js": "ember-cli/loader.js#3.2.0",
-    "locallyjs": "~0.3.1",
+    "locallyjs": "~0.3.2",
     "matchMedia": "~0.2.0",
     "nouislider": "^8.0.1",
     "qunit": "~1.18.0",