Changeset 29943

Timestamp:

2015-06-01T09:59:43+12:00 (9 years ago)

Author:

davidb

Message:

More careful control of keyboard events so text can reach the custom chord part of the system without accidentally playing notes on the piano at the same time

File:

• main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/audiosynth.view.js (modified) (6 diffs)

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/audiosynth.view.js

@@ -2 +2 @@
 
     var isMobile = !!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i);
+    //isMobile = true;
     if(isMobile) { var evtListener = ['touchstart', 'touchend']; } else { var evtListener = ['mousedown', 'mouseup']; }
+
+    //console.log("*** pointerEnabled: " + window.navigator.pointerEnabled);
+
+    //var evtListener = ['pointerdown', 'pointerup']; 
+    //var evtListener = ['touchstart', 'touchend']; 
+
 
     var __audioSynth = new AudioSynth();
@@ -256 +263 @@
     var fnPlayNote = function(note, octave) {
 
-    //console.log("**** Note started: " + Date.now()/1000.0)
+    console.log("**** Note started: " + Date.now()/1000.0)
 
     playedNoteStartTime = Date.now();
@@ -301 +308 @@
 
     console.log("**** testing keyboard event key: '" + e.key + "' keycode = " + e.keyCode);
+
+    var $focused = $(':focus');
+    console.log("focused.id = " + $focused.attr("id"));
+
+    if ($focused.attr("id") == "addCustomChordText") {
+        // The keyboard event isn't for us (i.e. the piano/drum input chain).  
+        // Return 'true' so the event can reach customGuitar keyboard handler
+        return true;
+    }
+
 
     if (e.keyCode == 32) { // <space-bar>
@@ -402 +419 @@
         // console.log("**** " + playedNotePitch + " (midi pitch = " + playedMidiPitch+ ") startTime = ", relativePlayStartTime + ", duration = " + playedDuration);
 
+        // ***** xxxx
         mediaPlayedNotes[String(mediaStartPlayTime)].push( 
         { 'midiPitch'    : playedMidiPitch, 
@@ -417 +435 @@
     var fnRemoveKeyBinding = function(e) {
     
-    //console.log("**** key up at: " + Date.now())
+    console.log("**** key up at: " + Date.now())
     // console.log("*** event e = " + JSON.stringify(e));
 
@@ -483 +501 @@
     }
 
-    e.preventDefault();
-    return false;
+    //e.preventDefault();
+    return true; // let other things outside of this piano/drum chain (such as the customGuitar input) see the event
     }