diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9e998b0..568e76b 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -46,7 +46,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); @@ -65,7 +65,7 @@ */ PIXI.ImageLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; /** @@ -103,7 +103,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() { + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); } diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9e998b0..568e76b 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -46,7 +46,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); @@ -65,7 +65,7 @@ */ PIXI.ImageLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; /** @@ -103,7 +103,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() { + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); } diff --git a/src/pixi/loaders/JsonLoader.js b/src/pixi/loaders/JsonLoader.js index c50be0a..5dc21ec 100644 --- a/src/pixi/loaders/JsonLoader.js +++ b/src/pixi/loaders/JsonLoader.js @@ -92,7 +92,7 @@ var frameData = this.json.frames; this.texture = image.texture.baseTexture; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); @@ -150,8 +150,7 @@ */ PIXI.JsonLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; @@ -163,8 +162,7 @@ * @private */ PIXI.JsonLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', + this.emit('error', { content: this }); }; \ No newline at end of file diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9e998b0..568e76b 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -46,7 +46,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); @@ -65,7 +65,7 @@ */ PIXI.ImageLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; /** @@ -103,7 +103,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() { + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); } diff --git a/src/pixi/loaders/JsonLoader.js b/src/pixi/loaders/JsonLoader.js index c50be0a..5dc21ec 100644 --- a/src/pixi/loaders/JsonLoader.js +++ b/src/pixi/loaders/JsonLoader.js @@ -92,7 +92,7 @@ var frameData = this.json.frames; this.texture = image.texture.baseTexture; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); @@ -150,8 +150,7 @@ */ PIXI.JsonLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; @@ -163,8 +162,7 @@ * @private */ PIXI.JsonLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', + this.emit('error', { content: this }); }; \ No newline at end of file diff --git a/src/pixi/loaders/SpineLoader.js b/src/pixi/loaders/SpineLoader.js index 23072f1..93caf5a 100644 --- a/src/pixi/loaders/SpineLoader.js +++ b/src/pixi/loaders/SpineLoader.js @@ -62,7 +62,7 @@ var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener("loaded", function (event) { + jsonLoader.on("loaded", function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -77,6 +77,6 @@ */ PIXI.SpineLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({type: "loaded", content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9e998b0..568e76b 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -46,7 +46,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); @@ -65,7 +65,7 @@ */ PIXI.ImageLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; /** @@ -103,7 +103,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() { + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); } diff --git a/src/pixi/loaders/JsonLoader.js b/src/pixi/loaders/JsonLoader.js index c50be0a..5dc21ec 100644 --- a/src/pixi/loaders/JsonLoader.js +++ b/src/pixi/loaders/JsonLoader.js @@ -92,7 +92,7 @@ var frameData = this.json.frames; this.texture = image.texture.baseTexture; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); @@ -150,8 +150,7 @@ */ PIXI.JsonLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; @@ -163,8 +162,7 @@ * @private */ PIXI.JsonLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', + this.emit('error', { content: this }); }; \ No newline at end of file diff --git a/src/pixi/loaders/SpineLoader.js b/src/pixi/loaders/SpineLoader.js index 23072f1..93caf5a 100644 --- a/src/pixi/loaders/SpineLoader.js +++ b/src/pixi/loaders/SpineLoader.js @@ -62,7 +62,7 @@ var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener("loaded", function (event) { + jsonLoader.on("loaded", function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -77,6 +77,6 @@ */ PIXI.SpineLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({type: "loaded", content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index bfb827a..c7cc9d1 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -78,7 +78,7 @@ PIXI.SpriteSheetLoader.prototype.load = function () { var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener('loaded', function (event) { + jsonLoader.on('loaded', function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -92,8 +92,7 @@ * @private */ PIXI.SpriteSheetLoader.prototype.onLoaded = function () { - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9e998b0..568e76b 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -46,7 +46,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); @@ -65,7 +65,7 @@ */ PIXI.ImageLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; /** @@ -103,7 +103,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() { + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); } diff --git a/src/pixi/loaders/JsonLoader.js b/src/pixi/loaders/JsonLoader.js index c50be0a..5dc21ec 100644 --- a/src/pixi/loaders/JsonLoader.js +++ b/src/pixi/loaders/JsonLoader.js @@ -92,7 +92,7 @@ var frameData = this.json.frames; this.texture = image.texture.baseTexture; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); @@ -150,8 +150,7 @@ */ PIXI.JsonLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; @@ -163,8 +162,7 @@ * @private */ PIXI.JsonLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', + this.emit('error', { content: this }); }; \ No newline at end of file diff --git a/src/pixi/loaders/SpineLoader.js b/src/pixi/loaders/SpineLoader.js index 23072f1..93caf5a 100644 --- a/src/pixi/loaders/SpineLoader.js +++ b/src/pixi/loaders/SpineLoader.js @@ -62,7 +62,7 @@ var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener("loaded", function (event) { + jsonLoader.on("loaded", function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -77,6 +77,6 @@ */ PIXI.SpineLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({type: "loaded", content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index bfb827a..c7cc9d1 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -78,7 +78,7 @@ PIXI.SpriteSheetLoader.prototype.load = function () { var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener('loaded', function (event) { + jsonLoader.on('loaded', function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -92,8 +92,7 @@ * @private */ PIXI.SpriteSheetLoader.prototype.onLoaded = function () { - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js index 5753a7a..178468e 100644 --- a/src/pixi/renderers/webgl/WebGLRenderer.js +++ b/src/pixi/renderers/webgl/WebGLRenderer.js @@ -66,8 +66,8 @@ this.contextLost = this.handleContextLost.bind(this); this.contextRestoredLost = this.handleContextRestored.bind(this); - this.view.addEventListener('webglcontextlost', this.contextLost, false); - this.view.addEventListener('webglcontextrestored', this.contextRestoredLost, false); + this.view.on('webglcontextlost', this.contextLost, false); + this.view.on('webglcontextrestored', this.contextRestoredLost, false); this.options = { alpha: this.transparent, @@ -540,8 +540,8 @@ // deal with losing context.. // remove listeners - this.view.removeEventListener('webglcontextlost', this.contextLost); - this.view.removeEventListener('webglcontextrestored', this.contextRestoredLost); + this.view.off('webglcontextlost', this.contextLost); + this.view.off('webglcontextrestored', this.contextRestoredLost); PIXI.glContexts[this.glContextId] = null; diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9e998b0..568e76b 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -46,7 +46,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); @@ -65,7 +65,7 @@ */ PIXI.ImageLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; /** @@ -103,7 +103,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() { + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); } diff --git a/src/pixi/loaders/JsonLoader.js b/src/pixi/loaders/JsonLoader.js index c50be0a..5dc21ec 100644 --- a/src/pixi/loaders/JsonLoader.js +++ b/src/pixi/loaders/JsonLoader.js @@ -92,7 +92,7 @@ var frameData = this.json.frames; this.texture = image.texture.baseTexture; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); @@ -150,8 +150,7 @@ */ PIXI.JsonLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; @@ -163,8 +162,7 @@ * @private */ PIXI.JsonLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', + this.emit('error', { content: this }); }; \ No newline at end of file diff --git a/src/pixi/loaders/SpineLoader.js b/src/pixi/loaders/SpineLoader.js index 23072f1..93caf5a 100644 --- a/src/pixi/loaders/SpineLoader.js +++ b/src/pixi/loaders/SpineLoader.js @@ -62,7 +62,7 @@ var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener("loaded", function (event) { + jsonLoader.on("loaded", function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -77,6 +77,6 @@ */ PIXI.SpineLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({type: "loaded", content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index bfb827a..c7cc9d1 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -78,7 +78,7 @@ PIXI.SpriteSheetLoader.prototype.load = function () { var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener('loaded', function (event) { + jsonLoader.on('loaded', function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -92,8 +92,7 @@ * @private */ PIXI.SpriteSheetLoader.prototype.onLoaded = function () { - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js index 5753a7a..178468e 100644 --- a/src/pixi/renderers/webgl/WebGLRenderer.js +++ b/src/pixi/renderers/webgl/WebGLRenderer.js @@ -66,8 +66,8 @@ this.contextLost = this.handleContextLost.bind(this); this.contextRestoredLost = this.handleContextRestored.bind(this); - this.view.addEventListener('webglcontextlost', this.contextLost, false); - this.view.addEventListener('webglcontextrestored', this.contextRestoredLost, false); + this.view.on('webglcontextlost', this.contextLost, false); + this.view.on('webglcontextrestored', this.contextRestoredLost, false); this.options = { alpha: this.transparent, @@ -540,8 +540,8 @@ // deal with losing context.. // remove listeners - this.view.removeEventListener('webglcontextlost', this.contextLost); - this.view.removeEventListener('webglcontextrestored', this.contextRestoredLost); + this.view.off('webglcontextlost', this.contextLost); + this.view.off('webglcontextrestored', this.contextRestoredLost); PIXI.glContexts[this.glContextId] = null; diff --git a/src/pixi/textures/BaseTexture.js b/src/pixi/textures/BaseTexture.js index 116f969..c13ed12 100644 --- a/src/pixi/textures/BaseTexture.js +++ b/src/pixi/textures/BaseTexture.js @@ -92,7 +92,7 @@ // add it to somewhere... PIXI.texturesToUpdate.push(scope); - scope.dispatchEvent( { type: 'loaded', content: scope } ); + scope.emit('loaded', { content: scope }); }; } diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9e998b0..568e76b 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -46,7 +46,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); @@ -65,7 +65,7 @@ */ PIXI.ImageLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; /** @@ -103,7 +103,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() { + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); } diff --git a/src/pixi/loaders/JsonLoader.js b/src/pixi/loaders/JsonLoader.js index c50be0a..5dc21ec 100644 --- a/src/pixi/loaders/JsonLoader.js +++ b/src/pixi/loaders/JsonLoader.js @@ -92,7 +92,7 @@ var frameData = this.json.frames; this.texture = image.texture.baseTexture; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); @@ -150,8 +150,7 @@ */ PIXI.JsonLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; @@ -163,8 +162,7 @@ * @private */ PIXI.JsonLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', + this.emit('error', { content: this }); }; \ No newline at end of file diff --git a/src/pixi/loaders/SpineLoader.js b/src/pixi/loaders/SpineLoader.js index 23072f1..93caf5a 100644 --- a/src/pixi/loaders/SpineLoader.js +++ b/src/pixi/loaders/SpineLoader.js @@ -62,7 +62,7 @@ var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener("loaded", function (event) { + jsonLoader.on("loaded", function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -77,6 +77,6 @@ */ PIXI.SpineLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({type: "loaded", content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index bfb827a..c7cc9d1 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -78,7 +78,7 @@ PIXI.SpriteSheetLoader.prototype.load = function () { var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener('loaded', function (event) { + jsonLoader.on('loaded', function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -92,8 +92,7 @@ * @private */ PIXI.SpriteSheetLoader.prototype.onLoaded = function () { - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js index 5753a7a..178468e 100644 --- a/src/pixi/renderers/webgl/WebGLRenderer.js +++ b/src/pixi/renderers/webgl/WebGLRenderer.js @@ -66,8 +66,8 @@ this.contextLost = this.handleContextLost.bind(this); this.contextRestoredLost = this.handleContextRestored.bind(this); - this.view.addEventListener('webglcontextlost', this.contextLost, false); - this.view.addEventListener('webglcontextrestored', this.contextRestoredLost, false); + this.view.on('webglcontextlost', this.contextLost, false); + this.view.on('webglcontextrestored', this.contextRestoredLost, false); this.options = { alpha: this.transparent, @@ -540,8 +540,8 @@ // deal with losing context.. // remove listeners - this.view.removeEventListener('webglcontextlost', this.contextLost); - this.view.removeEventListener('webglcontextrestored', this.contextRestoredLost); + this.view.off('webglcontextlost', this.contextLost); + this.view.off('webglcontextrestored', this.contextRestoredLost); PIXI.glContexts[this.glContextId] = null; diff --git a/src/pixi/textures/BaseTexture.js b/src/pixi/textures/BaseTexture.js index 116f969..c13ed12 100644 --- a/src/pixi/textures/BaseTexture.js +++ b/src/pixi/textures/BaseTexture.js @@ -92,7 +92,7 @@ // add it to somewhere... PIXI.texturesToUpdate.push(scope); - scope.dispatchEvent( { type: 'loaded', content: scope } ); + scope.emit('loaded', { content: scope }); }; } diff --git a/src/pixi/textures/Texture.js b/src/pixi/textures/Texture.js index 8500a6e..9b04c11 100644 --- a/src/pixi/textures/Texture.js +++ b/src/pixi/textures/Texture.js @@ -67,7 +67,7 @@ else { var scope = this; - baseTexture.addEventListener('loaded', function(){ scope.onBaseTextureLoaded(); }); + baseTexture.on('loaded', function(){ scope.onBaseTextureLoaded(); }); } }; @@ -83,13 +83,13 @@ PIXI.Texture.prototype.onBaseTextureLoaded = function() { var baseTexture = this.baseTexture; - baseTexture.removeEventListener( 'loaded', this.onLoaded ); + baseTexture.off( 'loaded', this.onLoaded ); if(this.noFrame)this.frame = new PIXI.Rectangle(0,0, baseTexture.width, baseTexture.height); this.setFrame(this.frame); - this.scope.dispatchEvent( { type: 'update', content: this } ); + this.scope.emit('update', { content: this }); }; /** @@ -125,7 +125,7 @@ PIXI.Texture.frameUpdates.push(this); - //this.dispatchEvent( { type: 'update', content: this } ); + //this.emit('update', { content: this }); }; PIXI.Texture.prototype._updateWebGLuvs = function() diff --git a/src/pixi/InteractionManager.js b/src/pixi/InteractionManager.js index 8153beb..bbf6f47 100644 --- a/src/pixi/InteractionManager.js +++ b/src/pixi/InteractionManager.js @@ -195,16 +195,16 @@ this.interactionDOMElement = domElement; - domElement.addEventListener('mousemove', this.onMouseMove, true); - domElement.addEventListener('mousedown', this.onMouseDown, true); - domElement.addEventListener('mouseout', this.onMouseOut, true); + domElement.on('mousemove', this.onMouseMove, true); + domElement.on('mousedown', this.onMouseDown, true); + domElement.on('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - domElement.addEventListener('touchstart', this.onTouchStart, true); - domElement.addEventListener('touchend', this.onTouchEnd, true); - domElement.addEventListener('touchmove', this.onTouchMove, true); + domElement.on('touchstart', this.onTouchStart, true); + domElement.on('touchend', this.onTouchEnd, true); + domElement.on('touchmove', this.onTouchMove, true); - window.addEventListener('mouseup', this.onMouseUp, true); + window.on('mouseup', this.onMouseUp, true); }; @@ -215,18 +215,18 @@ this.interactionDOMElement.style['-ms-content-zooming'] = ''; this.interactionDOMElement.style['-ms-touch-action'] = ''; - this.interactionDOMElement.removeEventListener('mousemove', this.onMouseMove, true); - this.interactionDOMElement.removeEventListener('mousedown', this.onMouseDown, true); - this.interactionDOMElement.removeEventListener('mouseout', this.onMouseOut, true); + this.interactionDOMElement.off('mousemove', this.onMouseMove, true); + this.interactionDOMElement.off('mousedown', this.onMouseDown, true); + this.interactionDOMElement.off('mouseout', this.onMouseOut, true); // aint no multi touch just yet! - this.interactionDOMElement.removeEventListener('touchstart', this.onTouchStart, true); - this.interactionDOMElement.removeEventListener('touchend', this.onTouchEnd, true); - this.interactionDOMElement.removeEventListener('touchmove', this.onTouchMove, true); + this.interactionDOMElement.off('touchstart', this.onTouchStart, true); + this.interactionDOMElement.off('touchend', this.onTouchEnd, true); + this.interactionDOMElement.off('touchmove', this.onTouchMove, true); this.interactionDOMElement = null; - window.removeEventListener('mouseup', this.onMouseUp, true); + window.off('mouseup', this.onMouseUp, true); }; /** diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 6525784..e1d4241 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -82,7 +82,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/extras/Strip.js b/src/pixi/extras/Strip.js index d75dc2c..14c045f 100644 --- a/src/pixi/extras/Strip.js +++ b/src/pixi/extras/Strip.js @@ -70,7 +70,7 @@ else { this.onTextureUpdateBind = this.onTextureUpdate.bind(this); - this.texture.addEventListener( 'update', this.onTextureUpdateBind ); + this.texture.on( 'update', this.onTextureUpdateBind ); } this.renderable = true; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 7b412c2..340f277 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -134,7 +134,7 @@ var loader = new Constructor(fileName, this.crossorigin); - loader.addEventListener('loaded', onLoad); + loader.on('loaded', onLoad); loader.load(); } }; @@ -148,12 +148,12 @@ PIXI.AssetLoader.prototype.onAssetLoaded = function(loader) { this.loadCount--; - this.dispatchEvent({ type: 'onProgress', content: this, loader: loader }); + this.emit('onProgress', { content: this, loader: loader }); if (this.onProgress) this.onProgress(loader); if (!this.loadCount) { - this.dispatchEvent({type: 'onComplete', content: this}); + this.emit('onComplete', { content: this }); if(this.onComplete) this.onComplete(); } }; diff --git a/src/pixi/loaders/AtlasLoader.js b/src/pixi/loaders/AtlasLoader.js index 98e32c9..5476da1 100644 --- a/src/pixi/loaders/AtlasLoader.js +++ b/src/pixi/loaders/AtlasLoader.js @@ -145,7 +145,7 @@ this.currentImageId = 0; for (j = 0; j < this.images.length; j++) { - this.images[j].addEventListener('loaded', selfOnLoaded); + this.images[j].on('loaded', selfOnLoaded); } this.images[this.currentImageId].load(); @@ -170,10 +170,7 @@ this.images[this.currentImageId].load(); } else { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', - content: this - }); + this.emit('loaded', { content: this }); } }; @@ -183,8 +180,5 @@ * @private */ PIXI.AtlasLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', - content: this - }); + this.emit('error', { content: this }); }; diff --git a/src/pixi/loaders/BitmapFontLoader.js b/src/pixi/loaders/BitmapFontLoader.js index 78488d2..9082b33 100644 --- a/src/pixi/loaders/BitmapFontLoader.js +++ b/src/pixi/loaders/BitmapFontLoader.js @@ -154,7 +154,7 @@ PIXI.BitmapText.fonts[data.font] = data; var scope = this; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); image.load(); @@ -170,5 +170,5 @@ */ PIXI.BitmapFontLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js index 9e998b0..568e76b 100644 --- a/src/pixi/loaders/ImageLoader.js +++ b/src/pixi/loaders/ImageLoader.js @@ -46,7 +46,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); @@ -65,7 +65,7 @@ */ PIXI.ImageLoader.prototype.onLoaded = function() { - this.dispatchEvent({type: 'loaded', content: this}); + this.emit('loaded', { content: this }); }; /** @@ -103,7 +103,7 @@ if(!this.texture.baseTexture.hasLoaded) { var scope = this; - this.texture.baseTexture.addEventListener('loaded', function() { + this.texture.baseTexture.on('loaded', function() { scope.onLoaded(); }); } diff --git a/src/pixi/loaders/JsonLoader.js b/src/pixi/loaders/JsonLoader.js index c50be0a..5dc21ec 100644 --- a/src/pixi/loaders/JsonLoader.js +++ b/src/pixi/loaders/JsonLoader.js @@ -92,7 +92,7 @@ var frameData = this.json.frames; this.texture = image.texture.baseTexture; - image.addEventListener('loaded', function() { + image.on('loaded', function() { scope.onLoaded(); }); @@ -150,8 +150,7 @@ */ PIXI.JsonLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; @@ -163,8 +162,7 @@ * @private */ PIXI.JsonLoader.prototype.onError = function () { - this.dispatchEvent({ - type: 'error', + this.emit('error', { content: this }); }; \ No newline at end of file diff --git a/src/pixi/loaders/SpineLoader.js b/src/pixi/loaders/SpineLoader.js index 23072f1..93caf5a 100644 --- a/src/pixi/loaders/SpineLoader.js +++ b/src/pixi/loaders/SpineLoader.js @@ -62,7 +62,7 @@ var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener("loaded", function (event) { + jsonLoader.on("loaded", function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -77,6 +77,6 @@ */ PIXI.SpineLoader.prototype.onLoaded = function () { this.loaded = true; - this.dispatchEvent({type: "loaded", content: this}); + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index bfb827a..c7cc9d1 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -78,7 +78,7 @@ PIXI.SpriteSheetLoader.prototype.load = function () { var scope = this; var jsonLoader = new PIXI.JsonLoader(this.url, this.crossorigin); - jsonLoader.addEventListener('loaded', function (event) { + jsonLoader.on('loaded', function (event) { scope.json = event.content.json; scope.onLoaded(); }); @@ -92,8 +92,7 @@ * @private */ PIXI.SpriteSheetLoader.prototype.onLoaded = function () { - this.dispatchEvent({ - type: 'loaded', + this.emit('loaded', { content: this }); }; diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js index 5753a7a..178468e 100644 --- a/src/pixi/renderers/webgl/WebGLRenderer.js +++ b/src/pixi/renderers/webgl/WebGLRenderer.js @@ -66,8 +66,8 @@ this.contextLost = this.handleContextLost.bind(this); this.contextRestoredLost = this.handleContextRestored.bind(this); - this.view.addEventListener('webglcontextlost', this.contextLost, false); - this.view.addEventListener('webglcontextrestored', this.contextRestoredLost, false); + this.view.on('webglcontextlost', this.contextLost, false); + this.view.on('webglcontextrestored', this.contextRestoredLost, false); this.options = { alpha: this.transparent, @@ -540,8 +540,8 @@ // deal with losing context.. // remove listeners - this.view.removeEventListener('webglcontextlost', this.contextLost); - this.view.removeEventListener('webglcontextrestored', this.contextRestoredLost); + this.view.off('webglcontextlost', this.contextLost); + this.view.off('webglcontextrestored', this.contextRestoredLost); PIXI.glContexts[this.glContextId] = null; diff --git a/src/pixi/textures/BaseTexture.js b/src/pixi/textures/BaseTexture.js index 116f969..c13ed12 100644 --- a/src/pixi/textures/BaseTexture.js +++ b/src/pixi/textures/BaseTexture.js @@ -92,7 +92,7 @@ // add it to somewhere... PIXI.texturesToUpdate.push(scope); - scope.dispatchEvent( { type: 'loaded', content: scope } ); + scope.emit('loaded', { content: scope }); }; } diff --git a/src/pixi/textures/Texture.js b/src/pixi/textures/Texture.js index 8500a6e..9b04c11 100644 --- a/src/pixi/textures/Texture.js +++ b/src/pixi/textures/Texture.js @@ -67,7 +67,7 @@ else { var scope = this; - baseTexture.addEventListener('loaded', function(){ scope.onBaseTextureLoaded(); }); + baseTexture.on('loaded', function(){ scope.onBaseTextureLoaded(); }); } }; @@ -83,13 +83,13 @@ PIXI.Texture.prototype.onBaseTextureLoaded = function() { var baseTexture = this.baseTexture; - baseTexture.removeEventListener( 'loaded', this.onLoaded ); + baseTexture.off( 'loaded', this.onLoaded ); if(this.noFrame)this.frame = new PIXI.Rectangle(0,0, baseTexture.width, baseTexture.height); this.setFrame(this.frame); - this.scope.dispatchEvent( { type: 'update', content: this } ); + this.scope.emit('update', { content: this }); }; /** @@ -125,7 +125,7 @@ PIXI.Texture.frameUpdates.push(this); - //this.dispatchEvent( { type: 'update', content: this } ); + //this.emit('update', { content: this }); }; PIXI.Texture.prototype._updateWebGLuvs = function() diff --git a/test/lib/pixi/textures/Texture.js b/test/lib/pixi/textures/Texture.js index 4396dd2..aa7dce9 100644 --- a/test/lib/pixi/textures/Texture.js +++ b/test/lib/pixi/textures/Texture.js @@ -22,7 +22,7 @@ if (obj.baseTexture.hasLoaded) { confirmFrameDone(); } else { - obj.addEventListener('update', confirmFrameDone); + obj.on('update', confirmFrameDone); pixi_core_Rectangle_confirm(obj.frame, 0, 0, 1, 1); } }