@vpmedia/phaser 1.0.20 → 1.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "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/sound_manager.js

@@ -73,46 +73,45 @@ export default class {
     this.masterGain.connect(this.context.destination);
     // handle audio state unlock
     this.onUnlockEventBinded = this.onUnlockEvent.bind(this);
-    if (this.isUnlockNeeded()) {
+    if (this.context.state === 'suspended' || this.context.state === 'interrupted') {
       this.addUnlockHandlers();
     }
     this.context.addEventListener('statechange', () => {
       this.onLockChange.dispatch('onContextStateChange', { state: this.context.state, isLocked: this.isLocked });
-      if (this.isUnlockNeeded()) {
+      if (!this.isLocked && (this.context.state === 'suspended' || this.context.state === 'interrupted')) {
         this.addUnlockHandlers();
+      } else if (this.isLocked) {
+        this.removeUnlockHandlers();
       }  
     });
   }
 
-  isUnlockNeeded() {
-    return !this.isLocked && !this.noAudio && (this.context.state === 'suspended' || this.context.state === 'interrupted');
-  }
-
   addUnlockHandlers() {
+    this.isLocked = true;
     this.onLockChange.dispatch('addUnlockHandlers', { state: this.context.state, isLocked: this.isLocked });
     document.body.addEventListener('touchstart', this.onUnlockEventBinded, false);
     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() {
+    this.isLocked = false;
     this.onLockChange.dispatch('removeUnlockHandlers', { state: this.context.state, isLocked: this.isLocked });
     document.body.removeEventListener('touchstart', this.onUnlockEventBinded);
     document.body.removeEventListener('touchend', this.onUnlockEventBinded);
     document.body.removeEventListener('click', this.onUnlockEventBinded);
     document.body.removeEventListener('keydown', this.onUnlockEventBinded);
-    this.isLocked = false;
   }
 
   onUnlockEvent(event) {
-    this.onLockChange.dispatch('onUnlockEvent', { state: this.context.state, isLocked: this.isLocked, event });
-    if (!this.isUnlockNeeded()) {
+    const initialState = this.context.state;
+    if (this.context.state !== 'suspended' && this.context.state !== 'interrupted') {
+      this.onLockChange.dispatch('onUnlockResumeDenied', { state: this.context.state, isLocked: this.isLocked, event });
       this.removeUnlockHandlers();
       return;
     }
-    const initialState = this.context.state;
+    this.onLockChange.dispatch('onContextResumeStart', { state: this.context.state, isLocked: this.isLocked, event });
     this.context.resume().then(() => {
       this.onLockChange.dispatch('onContextResumeResult', { state: this.context.state, isLocked: this.isLocked });
       this.removeUnlockHandlers();