From 442e6bb7768bad3b3027924dc3d0b4c7ebaeff19 Mon Sep 17 00:00:00 2001 From: photonstorm Date: Sun, 2 Mar 2014 11:31:26 +0000 Subject: [PATCH] Events.onInputUp would be dispatched twice if the Sprite had drag enabled, now only dispatched once (thanks Overbryd, fixes #502) Changed webfont URI back to // --- README.md | 1 + examples/text/google webfonts.js | 2 +- examples/wip/google webfont.js | 2 +- src/input/InputHandler.js | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 91ab51a7..f2c0f0a6 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ Bug Fixes: * If the game was set to NO_SCALE and you swapped orientation, it would pause and resize, then fail to resize when you swapped back (thanks starnut, fixes #258) * Device no longer things a Windows Phone or Windows Tablet are desktop devices (thanks wombatbuddy, fixes #506) * Sound.onMarkerComplete event is now dispatched when a marker stops. See Sound.onLoop for a looping marker event (thanks registered99, fixes #500) +* Events.onInputUp would be dispatched twice if the Sprite had drag enabled, now only dispatched once (thanks Overbryd, fixes #502) TO DO: diff --git a/examples/text/google webfonts.js b/examples/text/google webfonts.js index 5fc874c7..814f7541 100644 --- a/examples/text/google webfonts.js +++ b/examples/text/google webfonts.js @@ -19,7 +19,7 @@ WebFontConfig = { function preload() { // Load the Google WebFont Loader script - game.load.script('webfont', 'http://ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js'); + game.load.script('webfont', '//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js'); } diff --git a/examples/wip/google webfont.js b/examples/wip/google webfont.js index 51fd9897..4b9f5ae7 100644 --- a/examples/wip/google webfont.js +++ b/examples/wip/google webfont.js @@ -19,7 +19,7 @@ WebFontConfig = { function preload() { // Load the Google WebFont Loader script - game.load.script('webfont', 'http://ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js'); + game.load.script('webfont', '//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js'); } diff --git a/src/input/InputHandler.js b/src/input/InputHandler.js index 210f34c2..35695e7c 100644 --- a/src/input/InputHandler.js +++ b/src/input/InputHandler.js @@ -1118,7 +1118,6 @@ Phaser.InputHandler.prototype = { } this.sprite.events.onDragStop.dispatch(this.sprite, pointer); - this.sprite.events.onInputUp.dispatch(this.sprite, pointer); if (this.checkPointerOver(pointer) === false) {