Refactored, focus on playback

JasonEb · Jun 3, 2015 · 38bc571 · 38bc571
1 parent 82be2a9
commit 38bc571
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/app/assets/javascripts/components/key.js.jsx b/app/assets/javascripts/components/key.js.jsx
@@ -1,9 +1,9 @@
 var Key = React.createClass({
   getInitialState:function () {
-    return { notes: KeyStore.all(), color: '#D3D3D3', scale: 'scale(1)' }
+    return { color: '#D3D3D3', scale: 'scale(1)' }
   },
   _onChange: function () {
-    var notes = this.state.notes;
+    var notes = KeyStore.all();
     var key = this.props.noteName;
     if (notes[key]) {
       this.note.start();

diff --git a/app/assets/javascripts/stores/KeyStore.js b/app/assets/javascripts/stores/KeyStore.js
@@ -4,9 +4,8 @@
 
   root.KeyStore = $.extend({}, EventEmitter.prototype, {
     all: function () {
-      return _keys;
+      return JSON.parse(JSON.stringify(_keys));
     },
-
     addChangeListener: function(callback){
       this.on(CHANGE_EVENT, callback);
     },
@@ -16,12 +15,16 @@
     dispatcherID: AppDispatcher.register(function(payload) {
       switch(payload.actionType) {
         case KeyConstants.KEY_PRESSED:
-          _keys[payload.key] = payload.key;
-          KeyStore.emit(CHANGE_EVENT);
+          if (!_keys[payload.key]) {
+            _keys[payload.key] = payload.key;
+            KeyStore.emit(CHANGE_EVENT);
+          }
           break;
         case KeyConstants.KEY_RELEASED:
-          delete _keys[payload.key];
-          KeyStore.emit(CHANGE_EVENT);
+          if (_keys[payload.key]) {
+            delete _keys[payload.key];
+            KeyStore.emit(CHANGE_EVENT);
+          }
           break;
       }
     })