diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js index ad7a028..7524b43 100644 --- a/src/accessibility/AccessibilityManager.js +++ b/src/accessibility/AccessibilityManager.js @@ -1,10 +1,11 @@ import core from '../core'; import Device from 'ismobilejs'; +import accessibleTarget from './accessibleTarget'; // add some extra variables to the container.. Object.assign( core.DisplayObject.prototype, - require('./accessibleTarget') + accessibleTarget ); /** diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js index ad7a028..7524b43 100644 --- a/src/accessibility/AccessibilityManager.js +++ b/src/accessibility/AccessibilityManager.js @@ -1,10 +1,11 @@ import core from '../core'; import Device from 'ismobilejs'; +import accessibleTarget from './accessibleTarget'; // add some extra variables to the container.. Object.assign( core.DisplayObject.prototype, - require('./accessibleTarget') + accessibleTarget ); /** diff --git a/src/core/text/Text.js b/src/core/text/Text.js index 8fc5915..5850fa9 100644 --- a/src/core/text/Text.js +++ b/src/core/text/Text.js @@ -28,13 +28,15 @@ * @param [style] {object|PIXI.TextStyle} The style parameters */ class Text extends Sprite -{ +{ constructor(text, style) { - let texture = Texture.fromCanvas(document.createElement('canvas')); + let canvas = document.createElement('canvas'); + let texture = Texture.fromCanvas(canvas); + texture.orig = new math.Rectangle(); texture.trim = new math.Rectangle(); - + super(texture); /** @@ -42,7 +44,7 @@ * * @member {HTMLCanvasElement} */ - this.canvas = document.createElement('canvas'); + this.canvas = canvas; /** * The canvas 2d context that everything is drawn with diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js index ad7a028..7524b43 100644 --- a/src/accessibility/AccessibilityManager.js +++ b/src/accessibility/AccessibilityManager.js @@ -1,10 +1,11 @@ import core from '../core'; import Device from 'ismobilejs'; +import accessibleTarget from './accessibleTarget'; // add some extra variables to the container.. Object.assign( core.DisplayObject.prototype, - require('./accessibleTarget') + accessibleTarget ); /** diff --git a/src/core/text/Text.js b/src/core/text/Text.js index 8fc5915..5850fa9 100644 --- a/src/core/text/Text.js +++ b/src/core/text/Text.js @@ -28,13 +28,15 @@ * @param [style] {object|PIXI.TextStyle} The style parameters */ class Text extends Sprite -{ +{ constructor(text, style) { - let texture = Texture.fromCanvas(document.createElement('canvas')); + let canvas = document.createElement('canvas'); + let texture = Texture.fromCanvas(canvas); + texture.orig = new math.Rectangle(); texture.trim = new math.Rectangle(); - + super(texture); /** @@ -42,7 +44,7 @@ * * @member {HTMLCanvasElement} */ - this.canvas = document.createElement('canvas'); + this.canvas = canvas; /** * The canvas 2d context that everything is drawn with diff --git a/src/extras/index.js b/src/extras/index.js index af2e89e..a8cedf6 100644 --- a/src/extras/index.js +++ b/src/extras/index.js @@ -2,9 +2,10 @@ import TilingSprite from './TilingSprite'; import BitmapText from './BitmapText'; -require('./cacheAsBitmap'); -require('./getChildByName'); -require('./getGlobalPosition'); +import cacheAsBitmap from './cacheAsBitmap'; +import getChildByName from './getChildByName'; +import getGlobalPosition from './getGlobalPosition'; + /** * @namespace PIXI.extras @@ -12,5 +13,8 @@ export default { MovieClip, TilingSprite, - BitmapText + BitmapText, + cacheAsBitmap, + getChildByName, + getGlobalPosition }; \ No newline at end of file diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js index ad7a028..7524b43 100644 --- a/src/accessibility/AccessibilityManager.js +++ b/src/accessibility/AccessibilityManager.js @@ -1,10 +1,11 @@ import core from '../core'; import Device from 'ismobilejs'; +import accessibleTarget from './accessibleTarget'; // add some extra variables to the container.. Object.assign( core.DisplayObject.prototype, - require('./accessibleTarget') + accessibleTarget ); /** diff --git a/src/core/text/Text.js b/src/core/text/Text.js index 8fc5915..5850fa9 100644 --- a/src/core/text/Text.js +++ b/src/core/text/Text.js @@ -28,13 +28,15 @@ * @param [style] {object|PIXI.TextStyle} The style parameters */ class Text extends Sprite -{ +{ constructor(text, style) { - let texture = Texture.fromCanvas(document.createElement('canvas')); + let canvas = document.createElement('canvas'); + let texture = Texture.fromCanvas(canvas); + texture.orig = new math.Rectangle(); texture.trim = new math.Rectangle(); - + super(texture); /** @@ -42,7 +44,7 @@ * * @member {HTMLCanvasElement} */ - this.canvas = document.createElement('canvas'); + this.canvas = canvas; /** * The canvas 2d context that everything is drawn with diff --git a/src/extras/index.js b/src/extras/index.js index af2e89e..a8cedf6 100644 --- a/src/extras/index.js +++ b/src/extras/index.js @@ -2,9 +2,10 @@ import TilingSprite from './TilingSprite'; import BitmapText from './BitmapText'; -require('./cacheAsBitmap'); -require('./getChildByName'); -require('./getGlobalPosition'); +import cacheAsBitmap from './cacheAsBitmap'; +import getChildByName from './getChildByName'; +import getGlobalPosition from './getGlobalPosition'; + /** * @namespace PIXI.extras @@ -12,5 +13,8 @@ export default { MovieClip, TilingSprite, - BitmapText + BitmapText, + cacheAsBitmap, + getChildByName, + getGlobalPosition }; \ No newline at end of file diff --git a/src/interaction/InteractionManager.js b/src/interaction/InteractionManager.js index b38bf03..eb6623e 100644 --- a/src/interaction/InteractionManager.js +++ b/src/interaction/InteractionManager.js @@ -1,11 +1,12 @@ import core from '../core'; import InteractionData from './InteractionData'; import EventEmitter from 'eventemitter3'; +import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into core.DisplayObject.prototype Object.assign( core.DisplayObject.prototype, - require('./interactiveTarget') + interactiveTarget ); /** @@ -202,113 +203,113 @@ /** * Fired when a pointing device button (usually a mouse button) is pressed on the display object. - * + * * @memberof PIXI.interaction.InteractionManager# * @event mousedown */ /** * Fired when a pointing device secondary button (usually a mouse right-button) is pressed on the display object. - * + * * @memberof PIXI.interaction.InteractionManager# * @event rightdown */ /** * Fired when a pointing device button (usually a mouse button) is released over the display object. - * + * * @memberof PIXI.interaction.InteractionManager# * @event mouseup */ /** * Fired when a pointing device secondary button (usually a mouse right-button) is released over the display object. - * + * * @memberof PIXI.interaction.InteractionManager# * @event rightup */ /** * Fired when a pointing device button (usually a mouse button) is pressed and released on the display object. - * + * * @event click * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a pointing device secondary button (usually a mouse right-button) is pressed and released on the display object. - * + * * @event rightclick * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a pointing device button (usually a mouse button) is released outside the display object that initially registered a [mousedown]{@link PIXI.interaction.InteractionManager#event:mousedown}. - * + * * @event mouseupoutside * @memberof PIXI.interaction.InteractionManager# */ /** - * Fired when a pointing device secondary button (usually a mouse right-button) is released outside the display object that initially + * Fired when a pointing device secondary button (usually a mouse right-button) is released outside the display object that initially * registered a [rightdown]{@link PIXI.interaction.InteractionManager#event:rightdown}. - * + * * @event rightupoutside * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a pointing device (usually a mouse) is moved while over the display object - * + * * @event mousemove * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a pointing device (usually a mouse) is moved onto the display object - * + * * @event mouseover * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a pointing device (usually a mouse) is moved off the display object - * + * * @event mouseout * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a touch point is placed on the display object. - * + * * @event touchstart * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a touch point is removed from the display object. - * + * * @event touchend * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a touch point is placed and removed from the display object. - * + * * @event tap * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a touch point is removed outside of the display object that initially registered a [touchstart]{@link PIXI.interaction.InteractionManager#event:touchstart}. - * + * * @event touchendoutside * @memberof PIXI.interaction.InteractionManager# */ /** * Fired when a touch point is moved along the display object. - * + * * @event touchmove * @memberof PIXI.interaction.InteractionManager# */