# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1515515276 0
# Node ID 39ffb48949ded53125b23fd9182d13156c624e34
# Parent  1ff68ea1a4cf818641aad81f89f94242f98ea676# Parent  2e8bf9499e9210c8a85544cc0eb7513a727b4f65
Merge branch 'vnext' into Dev_main

diff -r 1ff68ea1a4cf -r 39ffb48949de js/core.js
--- a/js/core.js	Tue Jan 09 16:13:40 2018 +0000
+++ b/js/core.js	Tue Jan 09 16:27:56 2018 +0000
@@ -2429,13 +2429,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);