# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1515515270 0
# Node ID 2e8bf9499e9210c8a85544cc0eb7513a727b4f65
# Parent  2fe3caf84422c474b67e4297cf6fe9901f4f949d# Parent  31a7a34bad6b9da975864bf8fd4ea21d2971bfc3
Merge branch 'master' into vnext

diff -r 2fe3caf84422 -r 2e8bf9499e92 js/core.js
--- a/js/core.js	Tue Jan 09 16:13:32 2018 +0000
+++ b/js/core.js	Tue Jan 09 16:27:50 2018 +0000
@@ -2420,13 +2420,19 @@
                         audioEngineContext.play(this.keys[index].audioObject.id);
                     }
                 }
+
+                function trackCommentFocus() {
+                    return document.activeElement.className.indexOf("trackComment") >= 0;
+                }
                 if (e.key === " ") {
-                    if (isPlaying()) {
+                    if (isPlaying() && trackCommentFocus() == false) {
+                        e.preventDefault();
                         audioEngineContext.stop();
                     }
                 } else {
                     keypress.call(this, e.key);
                 }
+                console.log(e);
             }
         };
         document.addEventListener("keydown", keyboardInterfaceController, false);