Skip to content

Commit 0ca5aa0

Browse files
author
Andrew Start
committed
Merge branch 'dev'
2 parents 05f5af5 + 0a42ec0 commit 0ca5aa0

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,4 @@ This content is released under the (http://opensource.org/licenses/MIT) MIT Lice
190190
- Gave DisplayObject default width/height properties, and changed the children bounds version of width/height on DisplayObjectContainer to be optional
191191
- Pivot points of text are based on their alignment, e.g. the pivot point of right aligned fields is at the right edge of the text.
192192
- Dropped use of ActiveXObject in PIXI.AjaxRequest because we don't care aobut old versions of IE.
193+
- Moved touchstart callback to come after setting touch data to make it easier to transfer a touch between display objects.

bin/pixi.dev.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* @license
3-
* pixi.js - v2.1.7
3+
* pixi.js - v2.1.8
44
* Copyright (c) 2012-2014, Mat Groves
55
* http://goodboydigital.com/
66
*
7-
* Compiled: 2015-03-10
7+
* Compiled: 2015-03-17
88
*
99
* pixi.js is licensed under the MIT License.
1010
* http://www.opensource.org/licenses/mit-license.php
@@ -5405,10 +5405,11 @@ PIXI.InteractionManager.prototype.onTouchStart = function(event)
54055405
if (item.__hit)
54065406
{
54075407
//call the function!
5408-
if (item.touchstart)item.touchstart(touchData);
54095408
item.__isDown = true;
54105409
item.__touchData = item.__touchData || {};
54115410
item.__touchData[touchEvent.identifier] = touchData;
5411+
5412+
if (item.touchstart)item.touchstart(touchData);
54125413

54135414
if (!item.interactiveChildren) break;
54145415
}

bin/pixi.js

Lines changed: 3 additions & 3 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": "2.1.8",
3+
"version": "2.1.9",
44

55
"main": "bin/pixi.dev.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": "2.1.8",
3+
"version": "2.1.9",
44
"description": "Pixi.js is a fast lightweight 2D library that works across all devices.",
55

66
"author": "Mat Groves",

src/pixi/InteractionManager.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,10 +955,11 @@ PIXI.InteractionManager.prototype.onTouchStart = function(event)
955955
if (item.__hit)
956956
{
957957
//call the function!
958-
if (item.touchstart)item.touchstart(touchData);
959958
item.__isDown = true;
960959
item.__touchData = item.__touchData || {};
961960
item.__touchData[touchEvent.identifier] = touchData;
961+
962+
if (item.touchstart)item.touchstart(touchData);
962963

963964
if (!item.interactiveChildren) break;
964965
}

0 commit comments

Comments
 (0)