Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/input/Pointer.js
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ var Pointer = new Class({
*/
leftButtonReleased: function ()
{
return this.buttons === 0 ? (this.button === 0 && !this.isDown) : this.button === 0;
return this.buttons === 0 ? (this.button === 0 && !this.isDown) : (this.button === 0 && !this.leftButtonDown());
},

/**
Expand Down
57 changes: 57 additions & 0 deletions tests/input/Pointer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,63 @@ describe('Phaser.Input.Pointer', function ()
pointer.button = 0;
expect(pointer.leftButtonReleased()).toBe(true);
});

it('should return false after pressing the left button', function ()
{
var pointer = new Pointer(mockManager, 0);
pointer.down({ button: 0, buttons: 1 });
expect(pointer.leftButtonReleased()).toBe(false);
});

it('should return false after pressing the left button while the right button is held', function ()
{
var pointer = new Pointer(mockManager, 0);
pointer.down({ button: 2, buttons: 2 });
pointer.down({ button: 0, buttons: 3 });
expect(pointer.leftButtonReleased()).toBe(false);
});

it('should return true after releasing the left button', function ()
{
var pointer = new Pointer(mockManager, 0);
pointer.down({ button: 0, buttons: 1 });
pointer.up({ button: 0, buttons: 0 });
expect(pointer.leftButtonReleased()).toBe(true);
});

it('should return true after releasing the left button while the right button is held', function ()
{
var pointer = new Pointer(mockManager, 0);
pointer.down({ button: 2, buttons: 2 });
pointer.down({ button: 0, buttons: 3 });
pointer.up({ button: 0, buttons: 2 });
expect(pointer.isDown).toBe(true);
expect(pointer.leftButtonReleased()).toBe(true);
});

it('should return false after releasing a different button', function ()
{
var pointer = new Pointer(mockManager, 0);
pointer.down({ button: 2, buttons: 2 });
pointer.up({ button: 2, buttons: 0 });
expect(pointer.leftButtonReleased()).toBe(false);
});

it('should return false after starting a touch', function ()
{
var pointer = new Pointer(mockManager, 1);
pointer.touchstart({ identifier: 1 }, { timeStamp: 1000 });
expect(pointer.leftButtonReleased()).toBe(false);
});

it('should return true after ending a touch', function ()
{
var pointer = new Pointer(mockManager, 1);
var touch = { identifier: 1 };
pointer.touchstart(touch, { timeStamp: 1000 });
pointer.touchend(touch, { timeStamp: 1100 });
expect(pointer.leftButtonReleased()).toBe(true);
});
});

describe('rightButtonReleased', function ()
Expand Down