wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-06-30 16:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #382 Error when using InputHandler#onInputUp & sprite destroys itself during the event.

Browse Source
This commit is contained in:
photonstorm
2014-02-10 02:14:59 +00:00
parent 0294a4735d
commit ae74cb02dd
5 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input/InputHandler.js
+41 -3
View File
@@ -145,11 +145,15 @@ Phaser.InputHandler = function (sprite) {
this.consumePointerEvent = false;
/**
* @property {Phaser.Point} _tempPoint - Description.
* @property {Phaser.Point} _tempPoint - Internal cache var.
* @private
*/
this._tempPoint = new Phaser.Point();
/**
* @property {array} _pointerData - Internal cache var.
* @private
*/
this._pointerData = [];
this._pointerData.push({
@@ -290,10 +294,12 @@ Phaser.InputHandler.prototype = {
this.game.input.interactiveItems.remove(this);
this.stop();
this._pointerData.length = 0;
this.boundsRect = null;
this.boundsSprite = null;
this.sprite = null;
}
},
/**
@@ -549,10 +555,17 @@ Phaser.InputHandler.prototype = {
/**
* Update.
* @method Phaser.InputHandler#update
* @protected
* @param {Phaser.Pointer} pointer
*/
update: function (pointer) {
if (this.sprite === null)
{
// Abort. We've been destroyed.
return;
}
if (this.enabled === false || this.sprite.visible === false || (this.sprite.group && this.sprite.group.visible === false))
{
this._pointerOutHandler(pointer);
@@ -587,6 +600,12 @@ Phaser.InputHandler.prototype = {
*/
_pointerOverHandler: function (pointer) {
if (this.sprite === null)
{
// Abort. We've been destroyed.
return;
}
if (this._pointerData[pointer.id].isOver === false)
{
this._pointerData[pointer.id].isOver = true;
@@ -602,6 +621,7 @@ Phaser.InputHandler.prototype = {
this.sprite.events.onInputOver.dispatch(this.sprite, pointer);
}
},
/**
@@ -612,6 +632,12 @@ Phaser.InputHandler.prototype = {
*/
_pointerOutHandler: function (pointer) {
if (this.sprite === null)
{
// Abort. We've been destroyed.
return;
}
this._pointerData[pointer.id].isOver = false;
this._pointerData[pointer.id].isOut = true;
this._pointerData[pointer.id].timeOut = this.game.time.now;
@@ -636,6 +662,12 @@ Phaser.InputHandler.prototype = {
*/
_touchedHandler: function (pointer) {
if (this.sprite === null)
{
// Abort. We've been destroyed.
return;
}
if (this._pointerData[pointer.id].isDown === false && this._pointerData[pointer.id].isOver === true)
{
this._pointerData[pointer.id].isDown = true;
@@ -668,6 +700,12 @@ Phaser.InputHandler.prototype = {
*/
_releasedHandler: function (pointer) {
if (this.sprite === null)
{
// Abort. We've been destroyed.
return;
}
// If was previously touched by this Pointer, check if still is AND still over this item
if (this._pointerData[pointer.id].isDown && pointer.isUp)
{