@vpmedia/phaser 1.0.18 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "@vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",

package/src/phaser/core/input.js

@@ -137,33 +137,6 @@ export default class {
     }
   }
 
-  addTouchLockCallback(callback, context, onEnd = false) {
-    this.lockCallbacks.push({ callback, context, onEnd });
-  }
-
-  removeTouchLockCallback(callback, context) {
-    let i = this.lockCallbacks.length;
-    while (i) {
-      i -= 1;
-      if (this.lockCallbacks[i].callback === callback && this.lockCallbacks[i].context === context) {
-        this.lockCallbacks.splice(i, 1);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  executeTouchLockCallbacks(onEnd, event) {
-    let i = this.lockCallbacks.length;
-    while (i) {
-      i -= 1;
-      const cb = this.lockCallbacks[i];
-      if (cb.onEnd === onEnd && cb.callback.call(cb.context, this, event)) {
-        this.lockCallbacks.splice(i, 1);
-      }
-    }
-  }
-
   addPointer() {
     if (this.pointers.length >= MAX_POINTERS) {
       console.warn('Input.addPointer: Maximum limit of ' + MAX_POINTERS + ' pointers reached.');

package/src/phaser/core/input_mspointer.js

@@ -77,7 +77,6 @@ export default class {
   }
 
   onPointerDown(event) {
-    this.game.input.executeTouchLockCallbacks(false, event);
     this.event = event;
     this.eventPreventDefault(event);
     if (this.pointerDownCallback) {
@@ -112,7 +111,6 @@ export default class {
   }
 
   onPointerUp(event) {
-    this.game.input.executeTouchLockCallbacks(true, event);
     this.event = event;
     this.eventPreventDefault(event);
     if (this.pointerUpCallback) {

package/src/phaser/core/input_touch.js

@@ -66,7 +66,6 @@ export default class {
   }
 
   onTouchStart(event) {
-    this.game.input.executeTouchLockCallbacks(false, event);
     this.event = event;
     if (!this.game.input.enabled || !this.enabled) {
       return;
@@ -130,7 +129,6 @@ export default class {
   }
 
   onTouchEnd(event) {
-    this.game.input.executeTouchLockCallbacks(true, event);
     this.event = event;
     if (this.touchEndCallback) {
       this.touchEndCallback.call(this.callbackContext, event);

package/src/phaser/core/sound_manager.js

@@ -70,16 +70,20 @@ export default class {
     }
     this.masterGain.gain.value = 1;
     this.masterGain.connect(this.context.destination);
-    // handle audio context state
-    console.log("AudioContext initial state", this.context.state);
-    this.context.onstatechange = () => {
-      console.log("AudioContext change state", this.context.state);
-    };
-    if (this.context.state === 'suspended') {
-      this.isLocked = true;
-      this.onUnlockEventBinded = this.onUnlockEvent.bind(this);
+    // handle audio state unlock
+    this.onUnlockEventBinded = this.onUnlockEvent.bind(this);
+    if (this.isUnlockNeeded()) {
       this.addUnlockHandlers();
     }
+    this.context.addEventListener('statechange', () => {
+      if (this.isUnlockNeeded()) {
+        this.addUnlockHandlers();
+      }  
+    });
+  }
+
+  isUnlockNeeded() {
+    return !this.isLocked && !this.noAudio && (this.context.state === 'suspended' || this.context.state === 'interrupted');
   }
 
   addUnlockHandlers() {
@@ -87,6 +91,7 @@ export default class {
     document.body.addEventListener('touchend', this.onUnlockEventBinded, false);
     document.body.addEventListener('click', this.onUnlockEventBinded, false);
     document.body.addEventListener('keydown', this.onUnlockEventBinded, false);
+    this.isLocked = true;
   }
 
   removeUnlockHandlers() {
@@ -94,24 +99,23 @@ export default class {
     document.body.removeEventListener('touchend', this.onUnlockEventBinded);
     document.body.removeEventListener('click', this.onUnlockEventBinded);
     document.body.removeEventListener('keydown', this.onUnlockEventBinded);
+    this.isLocked = false;
   }
 
-  onUnlockEvent(event) {
-    if (this.context.state !== 'suspended') {
+  onUnlockEvent() {
+    if (!this.isUnlockNeeded()) {
+      this.removeUnlockHandlers();
       return;
     }
-    console.log('onUnlockEvent', event);
+    const initialState = this.context.state;
     this.context.resume().then(() => {
       this.removeUnlockHandlers();
     }).catch((e) => {
       this.removeUnlockHandlers();
-      this.game.exceptionHandler(e, { state: this.context.state });
+      this.game.exceptionHandler(e, { initialState, state: this.context.state });
     });
   }
 
-  checkContextState() {
-  }
-
   stopAll() {
     if (this.noAudio) {
       return;