diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 7694867..5b4eb78 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -412,13 +412,15 @@ * @param event {Event} The DOM event of a mouse button being moved out * @private */ -PIXI.InteractionManager.prototype.onMouseOut = function() +PIXI.InteractionManager.prototype.onMouseOut = function(event) { if(this.dirty) { this.rebuildInteractiveGraph(); } + this.mouse.originalEvent = event || window.event; //IE uses window.event + var length = this.interactiveItems.length; this.interactionDOMElement.style.cursor = 'inherit'; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 7694867..5b4eb78 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -412,13 +412,15 @@ * @param event {Event} The DOM event of a mouse button being moved out * @private */ -PIXI.InteractionManager.prototype.onMouseOut = function() +PIXI.InteractionManager.prototype.onMouseOut = function(event) { if(this.dirty) { this.rebuildInteractiveGraph(); } + this.mouse.originalEvent = event || window.event; //IE uses window.event + var length = this.interactiveItems.length; this.interactionDOMElement.style.cursor = 'inherit'; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9d8c6bd..ad4c61c 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -4,7 +4,7 @@ /** * The image loader class is responsible for loading images file formats ('jpeg', 'jpg', 'png' and 'gif') - * Once the image has been loaded it is stored in the PIXI texture cache and can be accessed though PIXI.Texture.fromFrameId() and PIXI.Sprite.fromFrameId() + * Once the image has been loaded it is stored in the PIXI texture cache and can be accessed though PIXI.Texture.fromFrame() and PIXI.Sprite.fromFrame() * When loaded this class will dispatch a 'loaded' event * * @class ImageLoader @@ -84,7 +84,7 @@ { for (var x=0; x