Skip to content

Commit 0982970

Browse files
author
Lanny McNie
committed
Fixed issue with null/-1 mouse pointers in touch
Signed-off-by: Lanny McNie <lanny@gskinner.com>
1 parent f09d7f1 commit 0982970

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

VERSIONS.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Version NEXT [NOT RELEASED]
77
- fixed an issue when calling gotoAndStop(animation) in the animationend event stack for the same animation
88
- ColorMatrix no longer extends Array
99
- fixed ColorMatrix.toArray(), .concat(), and .clone()
10-
- fixed touch/multitouch in IE11
1110
- changed dblclick to use a canvas listener instead of global listener
1211
- added MouseEvent.localX/Y
12+
- fixed touch/multitouch in IE11
13+
- fixed issue with -1 mouse pointers (thanks cubica)
1314

1415

1516
Version 0.7.0 [September 25, 2013]

lib/easeljs-NEXT.min.js

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

src/easeljs/display/Stage.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,8 @@ var p = Stage.prototype = new createjs.Container();
589589
data = this._pointerData[id] = {x:0,y:0};
590590
// if it's the first new touch, then make it the primary pointer id:
591591
if (this._primaryPointerID == null) { this._primaryPointerID = id; }
592+
// if it's the mouse (id == -1) or the first new touch, then make it the primary pointer id:
593+
if (this._primaryPointerID == null || this._primaryPointerID == -1) { this._primaryPointerID = id; }
592594
}
593595
return data;
594596
};

src/easeljs/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ this.createjs = this.createjs || {};
2727
* @type String
2828
* @static
2929
**/
30-
s.buildDate = /*date*/"Tue, 19 Nov 2013 03:57:30 GMT"; // injected by build process
30+
s.buildDate = /*date*/"Mon, 25 Nov 2013 21:29:35 GMT"; // injected by build process
3131

3232
})();

0 commit comments

Comments
 (0)