Skip to content

Commit 11235ce

Browse files
author
Andrew Start
committed
InteractionData now has an id for touch ids.
1 parent 1ecec7c commit 11235ce

File tree

6 files changed

+26
-8
lines changed

6 files changed

+26
-8
lines changed

bin/pixi.dev.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* @license
3-
* pixi.js - v1.6.7
3+
* pixi.js - v1.6.8
44
* Copyright (c) 2012-2014, Mat Groves
55
* http://goodboydigital.com/
66
*
7-
* Compiled: 2014-10-27
7+
* Compiled: 2014-10-31
88
*
99
* pixi.js is licensed under the MIT License.
1010
* http://www.opensource.org/licenses/mit-license.php
@@ -3774,6 +3774,14 @@ PIXI.InteractionData = function()
37743774
* @type Event
37753775
*/
37763776
this.originalEvent = null;
3777+
3778+
/**
3779+
* The touch identifier from the browser, or -1 if it is a mouse event.
3780+
*
3781+
* @property id
3782+
* @type int
3783+
*/
3784+
this.id = -1;
37773785
};
37783786

37793787
/**
@@ -4539,6 +4547,7 @@ PIXI.InteractionManager.prototype.onTouchStart = function(event)
45394547
var touchData = this.pool.pop();
45404548
if(!touchData)touchData = new PIXI.InteractionData();
45414549

4550+
touchData.id = touchEvent.identifier;
45424551
touchData.originalEvent = event || window.event;
45434552

45444553
this.touchs[touchEvent.identifier] = touchData;

bin/pixi.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pixi.js",
3-
"version": "1.6.7",
3+
"version": "1.6.8",
44

55
"main": "bin/pixi.js",
66

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pixi.js",
3-
"version": "1.6.7",
3+
"version": "1.6.8",
44
"description": "Pixi.js is a fast lightweight 2D library that works across all devices.",
55

66
"author": "Mat Groves",

src/pixi/InteractionData.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ PIXI.InteractionData = function()
3434
* @type Event
3535
*/
3636
this.originalEvent = null;
37+
38+
/**
39+
* The touch identifier from the browser, or -1 if it is a mouse event.
40+
*
41+
* @property id
42+
* @type int
43+
*/
44+
this.id = -1;
3745
};
3846

3947
/**

src/pixi/InteractionManager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,7 @@ PIXI.InteractionManager.prototype.onTouchStart = function(event)
731731
var touchData = this.pool.pop();
732732
if(!touchData)touchData = new PIXI.InteractionData();
733733

734+
touchData.id = touchEvent.identifier;
734735
touchData.originalEvent = event || window.event;
735736

736737
this.touchs[touchEvent.identifier] = touchData;

0 commit comments

Comments
 (0)