diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js index 0c9cd38..cec002a 100644 --- a/src/pixi/textures/RenderTexture.js +++ b/src/pixi/textures/RenderTexture.js @@ -40,6 +40,7 @@ * @type Number */ this.width = width || 100; + /** * The height of the render texture * @@ -48,28 +49,17 @@ */ this.height = height || 100; - /** - * The framing rectangle of the render texture - * - * @property frame - * @type Rectangle - */ - this.frame = new PIXI.Rectangle(0, 0, this.width, this.height); + var baseTexture = new PIXI.BaseTexture(); + baseTexture.width = this.width; + baseTexture.height = this.height; + baseTexture._glTextures = []; + baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; + baseTexture.hasLoaded = true; - /** - * The base texture object that this texture uses - * - * @property baseTexture - * @type BaseTexture - */ - this.baseTexture = new PIXI.BaseTexture(); - this.baseTexture.width = this.width; - this.baseTexture.height = this.height; - this.baseTexture._glTextures = []; - - this.baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; - - this.baseTexture.hasLoaded = true; + PIXI.Texture.call(this, + baseTexture, + new PIXI.Rectangle(0, 0, this.width, this.height) + ); // each render texture can only belong to one renderer at the moment if its webGL this.renderer = renderer || PIXI.defaultRenderer; @@ -98,7 +88,6 @@ PIXI.RenderTexture.prototype = Object.create(PIXI.Texture.prototype); PIXI.RenderTexture.prototype.constructor = PIXI.RenderTexture; -PIXI.EventTarget.mixin(PIXI.RenderTexture.prototype); /** * Resize the RenderTexture. diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js index 0c9cd38..cec002a 100644 --- a/src/pixi/textures/RenderTexture.js +++ b/src/pixi/textures/RenderTexture.js @@ -40,6 +40,7 @@ * @type Number */ this.width = width || 100; + /** * The height of the render texture * @@ -48,28 +49,17 @@ */ this.height = height || 100; - /** - * The framing rectangle of the render texture - * - * @property frame - * @type Rectangle - */ - this.frame = new PIXI.Rectangle(0, 0, this.width, this.height); + var baseTexture = new PIXI.BaseTexture(); + baseTexture.width = this.width; + baseTexture.height = this.height; + baseTexture._glTextures = []; + baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; + baseTexture.hasLoaded = true; - /** - * The base texture object that this texture uses - * - * @property baseTexture - * @type BaseTexture - */ - this.baseTexture = new PIXI.BaseTexture(); - this.baseTexture.width = this.width; - this.baseTexture.height = this.height; - this.baseTexture._glTextures = []; - - this.baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; - - this.baseTexture.hasLoaded = true; + PIXI.Texture.call(this, + baseTexture, + new PIXI.Rectangle(0, 0, this.width, this.height) + ); // each render texture can only belong to one renderer at the moment if its webGL this.renderer = renderer || PIXI.defaultRenderer; @@ -98,7 +88,6 @@ PIXI.RenderTexture.prototype = Object.create(PIXI.Texture.prototype); PIXI.RenderTexture.prototype.constructor = PIXI.RenderTexture; -PIXI.EventTarget.mixin(PIXI.RenderTexture.prototype); /** * Resize the RenderTexture. diff --git a/src/pixi/utils/EventTarget.js b/src/pixi/utils/EventTarget.js index e59554f..39c04a7 100644 --- a/src/pixi/utils/EventTarget.js +++ b/src/pixi/utils/EventTarget.js @@ -252,6 +252,9 @@ */ this.data = data; + //backwards compat with older version of events + this.content = data; + /** * The timestamp when the event occurred. * diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js index 0c9cd38..cec002a 100644 --- a/src/pixi/textures/RenderTexture.js +++ b/src/pixi/textures/RenderTexture.js @@ -40,6 +40,7 @@ * @type Number */ this.width = width || 100; + /** * The height of the render texture * @@ -48,28 +49,17 @@ */ this.height = height || 100; - /** - * The framing rectangle of the render texture - * - * @property frame - * @type Rectangle - */ - this.frame = new PIXI.Rectangle(0, 0, this.width, this.height); + var baseTexture = new PIXI.BaseTexture(); + baseTexture.width = this.width; + baseTexture.height = this.height; + baseTexture._glTextures = []; + baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; + baseTexture.hasLoaded = true; - /** - * The base texture object that this texture uses - * - * @property baseTexture - * @type BaseTexture - */ - this.baseTexture = new PIXI.BaseTexture(); - this.baseTexture.width = this.width; - this.baseTexture.height = this.height; - this.baseTexture._glTextures = []; - - this.baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; - - this.baseTexture.hasLoaded = true; + PIXI.Texture.call(this, + baseTexture, + new PIXI.Rectangle(0, 0, this.width, this.height) + ); // each render texture can only belong to one renderer at the moment if its webGL this.renderer = renderer || PIXI.defaultRenderer; @@ -98,7 +88,6 @@ PIXI.RenderTexture.prototype = Object.create(PIXI.Texture.prototype); PIXI.RenderTexture.prototype.constructor = PIXI.RenderTexture; -PIXI.EventTarget.mixin(PIXI.RenderTexture.prototype); /** * Resize the RenderTexture. diff --git a/src/pixi/utils/EventTarget.js b/src/pixi/utils/EventTarget.js index e59554f..39c04a7 100644 --- a/src/pixi/utils/EventTarget.js +++ b/src/pixi/utils/EventTarget.js @@ -252,6 +252,9 @@ */ this.data = data; + //backwards compat with older version of events + this.content = data; + /** * The timestamp when the event occurred. * diff --git a/test/lib/pixi/textures/RenderTexture.js b/test/lib/pixi/textures/RenderTexture.js new file mode 100644 index 0000000..8556501 --- /dev/null +++ b/test/lib/pixi/textures/RenderTexture.js @@ -0,0 +1,14 @@ + +function pixi_textures_RenderTexture_confirmNew(obj, done) { + var expect = chai.expect; + + expect(obj).to.have.property('width'); + expect(obj).to.have.property('height'); + + expect(obj).to.have.property('render'); + expect(obj).to.have.property('renderer'); + // expect(obj).to.have.property('projection'); + expect(obj).to.have.property('textureBuffer'); + + pixi_textures_Texture_confirmNew(obj, done); +} diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js index 0c9cd38..cec002a 100644 --- a/src/pixi/textures/RenderTexture.js +++ b/src/pixi/textures/RenderTexture.js @@ -40,6 +40,7 @@ * @type Number */ this.width = width || 100; + /** * The height of the render texture * @@ -48,28 +49,17 @@ */ this.height = height || 100; - /** - * The framing rectangle of the render texture - * - * @property frame - * @type Rectangle - */ - this.frame = new PIXI.Rectangle(0, 0, this.width, this.height); + var baseTexture = new PIXI.BaseTexture(); + baseTexture.width = this.width; + baseTexture.height = this.height; + baseTexture._glTextures = []; + baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; + baseTexture.hasLoaded = true; - /** - * The base texture object that this texture uses - * - * @property baseTexture - * @type BaseTexture - */ - this.baseTexture = new PIXI.BaseTexture(); - this.baseTexture.width = this.width; - this.baseTexture.height = this.height; - this.baseTexture._glTextures = []; - - this.baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; - - this.baseTexture.hasLoaded = true; + PIXI.Texture.call(this, + baseTexture, + new PIXI.Rectangle(0, 0, this.width, this.height) + ); // each render texture can only belong to one renderer at the moment if its webGL this.renderer = renderer || PIXI.defaultRenderer; @@ -98,7 +88,6 @@ PIXI.RenderTexture.prototype = Object.create(PIXI.Texture.prototype); PIXI.RenderTexture.prototype.constructor = PIXI.RenderTexture; -PIXI.EventTarget.mixin(PIXI.RenderTexture.prototype); /** * Resize the RenderTexture. diff --git a/src/pixi/utils/EventTarget.js b/src/pixi/utils/EventTarget.js index e59554f..39c04a7 100644 --- a/src/pixi/utils/EventTarget.js +++ b/src/pixi/utils/EventTarget.js @@ -252,6 +252,9 @@ */ this.data = data; + //backwards compat with older version of events + this.content = data; + /** * The timestamp when the event occurred. * diff --git a/test/lib/pixi/textures/RenderTexture.js b/test/lib/pixi/textures/RenderTexture.js new file mode 100644 index 0000000..8556501 --- /dev/null +++ b/test/lib/pixi/textures/RenderTexture.js @@ -0,0 +1,14 @@ + +function pixi_textures_RenderTexture_confirmNew(obj, done) { + var expect = chai.expect; + + expect(obj).to.have.property('width'); + expect(obj).to.have.property('height'); + + expect(obj).to.have.property('render'); + expect(obj).to.have.property('renderer'); + // expect(obj).to.have.property('projection'); + expect(obj).to.have.property('textureBuffer'); + + pixi_textures_Texture_confirmNew(obj, done); +} diff --git a/test/lib/pixi/textures/Texture.js b/test/lib/pixi/textures/Texture.js index aa7dce9..b211d2c 100644 --- a/test/lib/pixi/textures/Texture.js +++ b/test/lib/pixi/textures/Texture.js @@ -11,7 +11,7 @@ } expect(obj).to.be.an.instanceof(PIXI.Texture); - pixi_utils_EventTarget_like(obj); + pixi_utils_EventTarget_confirm(obj); expect(obj).to.have.property('baseTexture') .and.to.be.an.instanceof(PIXI.BaseTexture); diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js index 0c9cd38..cec002a 100644 --- a/src/pixi/textures/RenderTexture.js +++ b/src/pixi/textures/RenderTexture.js @@ -40,6 +40,7 @@ * @type Number */ this.width = width || 100; + /** * The height of the render texture * @@ -48,28 +49,17 @@ */ this.height = height || 100; - /** - * The framing rectangle of the render texture - * - * @property frame - * @type Rectangle - */ - this.frame = new PIXI.Rectangle(0, 0, this.width, this.height); + var baseTexture = new PIXI.BaseTexture(); + baseTexture.width = this.width; + baseTexture.height = this.height; + baseTexture._glTextures = []; + baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; + baseTexture.hasLoaded = true; - /** - * The base texture object that this texture uses - * - * @property baseTexture - * @type BaseTexture - */ - this.baseTexture = new PIXI.BaseTexture(); - this.baseTexture.width = this.width; - this.baseTexture.height = this.height; - this.baseTexture._glTextures = []; - - this.baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; - - this.baseTexture.hasLoaded = true; + PIXI.Texture.call(this, + baseTexture, + new PIXI.Rectangle(0, 0, this.width, this.height) + ); // each render texture can only belong to one renderer at the moment if its webGL this.renderer = renderer || PIXI.defaultRenderer; @@ -98,7 +88,6 @@ PIXI.RenderTexture.prototype = Object.create(PIXI.Texture.prototype); PIXI.RenderTexture.prototype.constructor = PIXI.RenderTexture; -PIXI.EventTarget.mixin(PIXI.RenderTexture.prototype); /** * Resize the RenderTexture. diff --git a/src/pixi/utils/EventTarget.js b/src/pixi/utils/EventTarget.js index e59554f..39c04a7 100644 --- a/src/pixi/utils/EventTarget.js +++ b/src/pixi/utils/EventTarget.js @@ -252,6 +252,9 @@ */ this.data = data; + //backwards compat with older version of events + this.content = data; + /** * The timestamp when the event occurred. * diff --git a/test/lib/pixi/textures/RenderTexture.js b/test/lib/pixi/textures/RenderTexture.js new file mode 100644 index 0000000..8556501 --- /dev/null +++ b/test/lib/pixi/textures/RenderTexture.js @@ -0,0 +1,14 @@ + +function pixi_textures_RenderTexture_confirmNew(obj, done) { + var expect = chai.expect; + + expect(obj).to.have.property('width'); + expect(obj).to.have.property('height'); + + expect(obj).to.have.property('render'); + expect(obj).to.have.property('renderer'); + // expect(obj).to.have.property('projection'); + expect(obj).to.have.property('textureBuffer'); + + pixi_textures_Texture_confirmNew(obj, done); +} diff --git a/test/lib/pixi/textures/Texture.js b/test/lib/pixi/textures/Texture.js index aa7dce9..b211d2c 100644 --- a/test/lib/pixi/textures/Texture.js +++ b/test/lib/pixi/textures/Texture.js @@ -11,7 +11,7 @@ } expect(obj).to.be.an.instanceof(PIXI.Texture); - pixi_utils_EventTarget_like(obj); + pixi_utils_EventTarget_confirm(obj); expect(obj).to.have.property('baseTexture') .and.to.be.an.instanceof(PIXI.BaseTexture); diff --git a/test/lib/pixi/utils/EventTarget.js b/test/lib/pixi/utils/EventTarget.js index 40bb727..a0c3924 100644 --- a/test/lib/pixi/utils/EventTarget.js +++ b/test/lib/pixi/utils/EventTarget.js @@ -1,5 +1,5 @@ -function pixi_utils_EventTarget_like(obj) { +function pixi_utils_EventTarget_confirm(obj) { var expect = chai.expect; //public API @@ -15,3 +15,20 @@ expect(obj).to.respondTo('addEventListener'); expect(obj).to.respondTo('dispatchEvent'); } + +function pixi_utils_EventTarget_Event_confirm(event, obj, data) { + var expect = chai.expect; + + expect(event).to.be.an.instanceOf(PIXI.Event); + + expect(event).to.have.property('stopped', false); + expect(event).to.have.property('stoppedImmediate', false); + + expect(event).to.have.property('target', obj); + expect(event).to.have.property('type', data.type || 'myevent'); + expect(event).to.have.property('data', data); + expect(event).to.have.property('content', data); + + expect(event).to.respondTo('stopPropagation'); + expect(event).to.respondTo('stopImmediatePropagation'); +} \ No newline at end of file diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js index 0c9cd38..cec002a 100644 --- a/src/pixi/textures/RenderTexture.js +++ b/src/pixi/textures/RenderTexture.js @@ -40,6 +40,7 @@ * @type Number */ this.width = width || 100; + /** * The height of the render texture * @@ -48,28 +49,17 @@ */ this.height = height || 100; - /** - * The framing rectangle of the render texture - * - * @property frame - * @type Rectangle - */ - this.frame = new PIXI.Rectangle(0, 0, this.width, this.height); + var baseTexture = new PIXI.BaseTexture(); + baseTexture.width = this.width; + baseTexture.height = this.height; + baseTexture._glTextures = []; + baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; + baseTexture.hasLoaded = true; - /** - * The base texture object that this texture uses - * - * @property baseTexture - * @type BaseTexture - */ - this.baseTexture = new PIXI.BaseTexture(); - this.baseTexture.width = this.width; - this.baseTexture.height = this.height; - this.baseTexture._glTextures = []; - - this.baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; - - this.baseTexture.hasLoaded = true; + PIXI.Texture.call(this, + baseTexture, + new PIXI.Rectangle(0, 0, this.width, this.height) + ); // each render texture can only belong to one renderer at the moment if its webGL this.renderer = renderer || PIXI.defaultRenderer; @@ -98,7 +88,6 @@ PIXI.RenderTexture.prototype = Object.create(PIXI.Texture.prototype); PIXI.RenderTexture.prototype.constructor = PIXI.RenderTexture; -PIXI.EventTarget.mixin(PIXI.RenderTexture.prototype); /** * Resize the RenderTexture. diff --git a/src/pixi/utils/EventTarget.js b/src/pixi/utils/EventTarget.js index e59554f..39c04a7 100644 --- a/src/pixi/utils/EventTarget.js +++ b/src/pixi/utils/EventTarget.js @@ -252,6 +252,9 @@ */ this.data = data; + //backwards compat with older version of events + this.content = data; + /** * The timestamp when the event occurred. * diff --git a/test/lib/pixi/textures/RenderTexture.js b/test/lib/pixi/textures/RenderTexture.js new file mode 100644 index 0000000..8556501 --- /dev/null +++ b/test/lib/pixi/textures/RenderTexture.js @@ -0,0 +1,14 @@ + +function pixi_textures_RenderTexture_confirmNew(obj, done) { + var expect = chai.expect; + + expect(obj).to.have.property('width'); + expect(obj).to.have.property('height'); + + expect(obj).to.have.property('render'); + expect(obj).to.have.property('renderer'); + // expect(obj).to.have.property('projection'); + expect(obj).to.have.property('textureBuffer'); + + pixi_textures_Texture_confirmNew(obj, done); +} diff --git a/test/lib/pixi/textures/Texture.js b/test/lib/pixi/textures/Texture.js index aa7dce9..b211d2c 100644 --- a/test/lib/pixi/textures/Texture.js +++ b/test/lib/pixi/textures/Texture.js @@ -11,7 +11,7 @@ } expect(obj).to.be.an.instanceof(PIXI.Texture); - pixi_utils_EventTarget_like(obj); + pixi_utils_EventTarget_confirm(obj); expect(obj).to.have.property('baseTexture') .and.to.be.an.instanceof(PIXI.BaseTexture); diff --git a/test/lib/pixi/utils/EventTarget.js b/test/lib/pixi/utils/EventTarget.js index 40bb727..a0c3924 100644 --- a/test/lib/pixi/utils/EventTarget.js +++ b/test/lib/pixi/utils/EventTarget.js @@ -1,5 +1,5 @@ -function pixi_utils_EventTarget_like(obj) { +function pixi_utils_EventTarget_confirm(obj) { var expect = chai.expect; //public API @@ -15,3 +15,20 @@ expect(obj).to.respondTo('addEventListener'); expect(obj).to.respondTo('dispatchEvent'); } + +function pixi_utils_EventTarget_Event_confirm(event, obj, data) { + var expect = chai.expect; + + expect(event).to.be.an.instanceOf(PIXI.Event); + + expect(event).to.have.property('stopped', false); + expect(event).to.have.property('stoppedImmediate', false); + + expect(event).to.have.property('target', obj); + expect(event).to.have.property('type', data.type || 'myevent'); + expect(event).to.have.property('data', data); + expect(event).to.have.property('content', data); + + expect(event).to.respondTo('stopPropagation'); + expect(event).to.respondTo('stopImmediatePropagation'); +} \ No newline at end of file diff --git a/test/unit/pixi/textures/RenderTexture.js b/test/unit/pixi/textures/RenderTexture.js index 4a69b44..96acdb4 100644 --- a/test/unit/pixi/textures/RenderTexture.js +++ b/test/unit/pixi/textures/RenderTexture.js @@ -7,4 +7,9 @@ it('Module exists', function () { expect(RenderTexture).to.be.a('function'); }); + + it('Confirm new instance', function (done) { + var texture = new RenderTexture(100, 100, new PIXI.CanvasRenderer()); + pixi_textures_RenderTexture_confirmNew(texture, done); + }); }); diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js index 0c9cd38..cec002a 100644 --- a/src/pixi/textures/RenderTexture.js +++ b/src/pixi/textures/RenderTexture.js @@ -40,6 +40,7 @@ * @type Number */ this.width = width || 100; + /** * The height of the render texture * @@ -48,28 +49,17 @@ */ this.height = height || 100; - /** - * The framing rectangle of the render texture - * - * @property frame - * @type Rectangle - */ - this.frame = new PIXI.Rectangle(0, 0, this.width, this.height); + var baseTexture = new PIXI.BaseTexture(); + baseTexture.width = this.width; + baseTexture.height = this.height; + baseTexture._glTextures = []; + baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; + baseTexture.hasLoaded = true; - /** - * The base texture object that this texture uses - * - * @property baseTexture - * @type BaseTexture - */ - this.baseTexture = new PIXI.BaseTexture(); - this.baseTexture.width = this.width; - this.baseTexture.height = this.height; - this.baseTexture._glTextures = []; - - this.baseTexture.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT; - - this.baseTexture.hasLoaded = true; + PIXI.Texture.call(this, + baseTexture, + new PIXI.Rectangle(0, 0, this.width, this.height) + ); // each render texture can only belong to one renderer at the moment if its webGL this.renderer = renderer || PIXI.defaultRenderer; @@ -98,7 +88,6 @@ PIXI.RenderTexture.prototype = Object.create(PIXI.Texture.prototype); PIXI.RenderTexture.prototype.constructor = PIXI.RenderTexture; -PIXI.EventTarget.mixin(PIXI.RenderTexture.prototype); /** * Resize the RenderTexture. diff --git a/src/pixi/utils/EventTarget.js b/src/pixi/utils/EventTarget.js index e59554f..39c04a7 100644 --- a/src/pixi/utils/EventTarget.js +++ b/src/pixi/utils/EventTarget.js @@ -252,6 +252,9 @@ */ this.data = data; + //backwards compat with older version of events + this.content = data; + /** * The timestamp when the event occurred. * diff --git a/test/lib/pixi/textures/RenderTexture.js b/test/lib/pixi/textures/RenderTexture.js new file mode 100644 index 0000000..8556501 --- /dev/null +++ b/test/lib/pixi/textures/RenderTexture.js @@ -0,0 +1,14 @@ + +function pixi_textures_RenderTexture_confirmNew(obj, done) { + var expect = chai.expect; + + expect(obj).to.have.property('width'); + expect(obj).to.have.property('height'); + + expect(obj).to.have.property('render'); + expect(obj).to.have.property('renderer'); + // expect(obj).to.have.property('projection'); + expect(obj).to.have.property('textureBuffer'); + + pixi_textures_Texture_confirmNew(obj, done); +} diff --git a/test/lib/pixi/textures/Texture.js b/test/lib/pixi/textures/Texture.js index aa7dce9..b211d2c 100644 --- a/test/lib/pixi/textures/Texture.js +++ b/test/lib/pixi/textures/Texture.js @@ -11,7 +11,7 @@ } expect(obj).to.be.an.instanceof(PIXI.Texture); - pixi_utils_EventTarget_like(obj); + pixi_utils_EventTarget_confirm(obj); expect(obj).to.have.property('baseTexture') .and.to.be.an.instanceof(PIXI.BaseTexture); diff --git a/test/lib/pixi/utils/EventTarget.js b/test/lib/pixi/utils/EventTarget.js index 40bb727..a0c3924 100644 --- a/test/lib/pixi/utils/EventTarget.js +++ b/test/lib/pixi/utils/EventTarget.js @@ -1,5 +1,5 @@ -function pixi_utils_EventTarget_like(obj) { +function pixi_utils_EventTarget_confirm(obj) { var expect = chai.expect; //public API @@ -15,3 +15,20 @@ expect(obj).to.respondTo('addEventListener'); expect(obj).to.respondTo('dispatchEvent'); } + +function pixi_utils_EventTarget_Event_confirm(event, obj, data) { + var expect = chai.expect; + + expect(event).to.be.an.instanceOf(PIXI.Event); + + expect(event).to.have.property('stopped', false); + expect(event).to.have.property('stoppedImmediate', false); + + expect(event).to.have.property('target', obj); + expect(event).to.have.property('type', data.type || 'myevent'); + expect(event).to.have.property('data', data); + expect(event).to.have.property('content', data); + + expect(event).to.respondTo('stopPropagation'); + expect(event).to.respondTo('stopImmediatePropagation'); +} \ No newline at end of file diff --git a/test/unit/pixi/textures/RenderTexture.js b/test/unit/pixi/textures/RenderTexture.js index 4a69b44..96acdb4 100644 --- a/test/unit/pixi/textures/RenderTexture.js +++ b/test/unit/pixi/textures/RenderTexture.js @@ -7,4 +7,9 @@ it('Module exists', function () { expect(RenderTexture).to.be.a('function'); }); + + it('Confirm new instance', function (done) { + var texture = new RenderTexture(100, 100, new PIXI.CanvasRenderer()); + pixi_textures_RenderTexture_confirmNew(texture, done); + }); }); diff --git a/test/unit/pixi/utils/EventTarget.js b/test/unit/pixi/utils/EventTarget.js index eb0ea71..6c43ee0 100644 --- a/test/unit/pixi/utils/EventTarget.js +++ b/test/unit/pixi/utils/EventTarget.js @@ -24,26 +24,14 @@ }); it('Confirm new instance', function () { - pixi_utils_EventTarget_like(obj); + pixi_utils_EventTarget_confirm(obj); }); - it('simple on/emit case works', function (done) { + it('simple on/emit case works', function () { var myData = {}; obj.on('myevent', function (event) { - expect(event).to.be.an.instanceOf(PIXI.Event); - - expect(event).to.have.property('stopped', false); - expect(event).to.have.property('stoppedImmediate', false); - - expect(event).to.have.property('target', obj); - expect(event).to.have.property('type', 'myevent'); - expect(event).to.have.property('data', myData); - - expect(event).to.respondTo('stopPropagation'); - expect(event).to.respondTo('stopImmediatePropagation'); - - done(); + pixi_utils_EventTarget_Event_confirm(event, obj, myData); }); obj.emit('myevent', myData); @@ -182,7 +170,6 @@ var called = 0; function onMyEvent(e) { - console.log(e.type, this.istwo, this._listeners[e.type]); called++; } @@ -198,13 +185,22 @@ obj2.emit('myevent1'); obj2.emit('myevent2'); - expect(called).to.equal(4); + //we emit 4 times, but since obj2 is a child of obj the event should bubble + //up to obj and show up there as well. So the obj2.emit() calls each increment + //the counter twice. + expect(called).to.equal(6); }); it('is backwards compatible with older dispatchEvent', function () { - var called = 0; + var called = 0, + data = { + some: 'thing', + hello: true + }; - function onMyEvent() { + function onMyEvent(event) { + pixi_utils_EventTarget_Event_confirm(event, obj, data); + called++; } @@ -212,20 +208,35 @@ obj.on('myevent2', onMyEvent); obj.on('myevent3', onMyEvent); - obj.emit({ type: 'myevent1' }); - obj.emit({ type: 'myevent2' }); - obj.emit({ type: 'myevent3' }); + data.type = 'myevent1'; + obj.emit(data); + + data.type = 'myevent2'; + obj.emit(data); + + data.type = 'myevent3'; + obj.emit(data); obj.off('myevent2', onMyEvent); - obj.emit({ type: 'myevent1' }); - obj.emit({ type: 'myevent2' }); - obj.emit({ type: 'myevent3' }); + data.type = 'myevent1'; + obj.emit(data); + + data.type = 'myevent2'; + obj.emit(data); + + data.type = 'myevent3'; + obj.emit(data); expect(called).to.equal(5); }); it('is backwards compatible with older .call(this)', function () { + var Fn = function() { + PIXI.EventTarget.call(this); + }, + o = new Fn(); + pixi_utils_EventTarget_confirm(o); }); });