From 29c023c34308858c721f19480b42efb9c1d50685 Mon Sep 17 00:00:00 2001
From: lone-cloud <lonecloud604@pm.me>
Date: Fri, 2 Oct 2015 17:05:06 -0700
Subject: [PATCH] Trying out locally

---
 app/pods/components/music-tab/component.js    | 20 +++++++------------
 .../music-tab/mixins/music-control.js         |  7 ++++---
 bower.json                                    |  5 ++---
 ember-cli-build.js                            |  1 +
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js
index e0400d0..14bbd7b 100644
--- a/app/pods/components/music-tab/component.js
+++ b/app/pods/components/music-tab/component.js
@@ -415,7 +415,9 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
             self.simulateKick(mag);
           }
         }
-      });
+      }),
+      Store = window.Locally.Store,
+      locally = new Store();
 
     kick.on();
 
@@ -440,7 +442,8 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
 
     this.setProperties({
       dancer: dancer,
-      kick: kick
+      kick: kick,
+      locally: locally
     });
 
     navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
@@ -450,17 +453,8 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
     }
 
     ['volume', 'shuffle', 'repeat', 'volumeMuted', 'threshold', 'decay', 'frequency', 'speakerViewed', 'transitionTime', 'randomTransition', 'playerBottomDisplayed', 'onBeatBriAndColor', 'usingMic'].forEach(function (item) {
-      if (localStorage.getItem('huegasm.' + item)) {
-        var itemVal = localStorage.getItem('huegasm.' + item);
-        if (item === 'repeat' || item === 'volume' || item === 'decay' || item === 'threshold' || item === 'transitionTime') {
-          itemVal = Number(itemVal);
-        } else if(item === 'frequency') {
-          itemVal = itemVal.split(',').map(function(val){return Number(val);});
-        } else {
-          itemVal = (itemVal === 'true');
-        }
-
-        self.send(item+'Changed', itemVal);
+      if (locally.get('huegasm.' + item)) {
+        self.send(item+'Changed', locally.get('huegasm.' + item));
       }
     });
   },
diff --git a/app/pods/components/music-tab/mixins/music-control.js b/app/pods/components/music-tab/mixins/music-control.js
index 3946b58..884cddf 100644
--- a/app/pods/components/music-tab/mixins/music-control.js
+++ b/app/pods/components/music-tab/mixins/music-control.js
@@ -83,6 +83,7 @@ export default Em.Mixin.create({
   dragLeaveTimeoutHandle: null,
   visualizationsDisplayed: false,
   audioStream: null,
+  locallly: null,
 
   notUsingMic: Em.computed.not('usingMic'),
   playQueueEmpty: Em.computed.empty('playQueue'),
@@ -148,7 +149,7 @@ export default Em.Mixin.create({
     }
 
     this.set(name, value);
-    localStorage.setItem('huegasm.' + name, value);
+    this.get('locally').set('huegasm.' + name, value);
   },
 
   incrementElapseTimeHandle: null,
@@ -224,12 +225,12 @@ export default Em.Mixin.create({
   }.property('volumeMuted', 'volume'),
 
   onSpeakerViewedChange: function(){
-    localStorage.setItem('huegasm.speakerViewed', this.get('speakerViewed'));
+    this.get('locally').set('huegasm.speakerViewed', this.get('speakerViewed'));
     this.get('beatHistory').clear();
   }.observes('speakerViewed'),
 
   onOptionChange: function(self, option){
-    localStorage.setItem('huegasm.' + option, this.get(option));
+    this.get('locally').set('huegasm.' + option, this.get(option));
   }.observes('randomTransition', 'onBeatBriAndColor'),
 
   onRepeatChange: function () {
diff --git a/bower.json b/bower.json
index 78136b8..4c0df41 100644
--- a/bower.json
+++ b/bower.json
@@ -15,6 +15,7 @@
     "jquery": "~2.1.4",
     "jquery-mousewheel": "~3.1.13",
     "loader.js": "ember-cli/loader.js#3.2.0",
+    "locallyjs": "~0.3.1",
     "matchMedia": "~0.2.0",
     "nouislider": "^8.0.1",
     "qunit": "~1.18.0",
@@ -22,8 +23,6 @@
   },
   "resolutions": {
     "ember": "~2.0.2",
-    "jquery": "~2.1.4",
-    "ember-qunit": "0.4.9",
-    "qunit": "~1.18.0"
+    "jquery": "~2.1.4"
   }
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
index f00946c..c9065be 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -11,6 +11,7 @@ module.exports = function(defaults) {
   app.import('bower_components/JavaScript-ID3-Reader/dist/id3-minimized.js');
   app.import('bower_components/jquery-mousewheel/jquery.mousewheel.js');
   app.import('bower_components/three.js/three.js');
+  app.import('bower_components/locallyjs/dist/locally.min.js');
 
   // Use `app.import` to add additional libraries to the generated
   // output files.