Skip to content

Commit 40bf7ad

Browse files
author
Andrew Start
committed
Merge branch 'dev'
2 parents fe41c4b + 01ef6dc commit 40bf7ad

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

bin/pixi.dev.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright (c) 2012-2014, Mat Groves
55
* http://goodboydigital.com/
66
*
7-
* Compiled: 2014-08-29
7+
* Compiled: 2014-09-16
88
*
99
* pixi.js is licensed under the MIT License.
1010
* http://www.opensource.org/licenses/mit-license.php
@@ -4042,6 +4042,8 @@ PIXI.InteractionManager.prototype.cleanup = PIXI.InteractionManager.prototype.re
40424042
oldDOM.removeEventListener('touchend', this.onTouchEnd, true);
40434043
oldDOM.removeEventListener('touchmove', this.onTouchMove, true);
40444044

4045+
oldDOM.style.cursor = 'inherit';
4046+
40454047
this.interactionDOMElement = null;
40464048

40474049
window.removeEventListener('mouseup', this.onMouseUp, true);
@@ -4160,6 +4162,8 @@ PIXI.InteractionManager.prototype.rebuildInteractiveGraph = function()
41604162

41614163
PIXI.InteractionManager.prototype.updateCursor = function(mode)
41624164
{
4165+
if(!this.interactionDOMElement) return;
4166+
41634167
if(mode !== this.currentCursor)
41644168
{
41654169
this.currentCursor = mode;

0 commit comments

Comments
 (0)