# Conflicts:
#	src/mesh/Mesh.js

* Fix a bug about compute Text canvas size.

There are 2 bugs :
* should NOT use `this.context.lineWidth`  before `this.context.lineWidth = style.strokeThickness`.
* the default value of `style.strokeThickness` is `0` , but  `this.context.lineWidth` couldn't be 0 ( in HTML5 , context.lineWidth = 0 will be ignore). So we should NOT use `this.context.lineWidth` for computing size.

* Update Text.js

Don't need  ` + style.strokeThickness` again.

* Update Text.js

* Update Text.js

refactor :   change the  codes of computing `canvas.width` & `canvas.height`  in the same code style.

* use  `style` instead of `this._style`

The canvas could be passed into Text

Adds support for multiple font families

It could offer a bit little performance gains.

and in current version  https://github.com/pixijs/pixi.js/blob/master/src/core/text/Text.js#L637  , there is already used `_texture` .
So I think this patch is OK.

Remove the needless assignment operation.

This feature could help users to  share canvas among two or more  Text  objects （ like Graphics._SPRITE_TEXTURE in Graphics).

In the game ,normally  we need rebuild stage/scene when stage/scene changed ,  If Text supports passing canvas , we could avoid create and destroy HTMLCanvasElement often when game running. 

e.g. create a canvas-pool  cache some canvas for Text.

Parameter lines is a string array

Discovered that using this kind of code:

```const { MY_SETTING } from settings;```

means that changing settings properties has no effect as the objects
are being set before the user changes them.

* Made const that are setting writable

* Moved more items to the settings

* added prefer-const rule to .eslintrc

* eslint const autofixes

* manual let to const changes; lint free;

* added brace style 'allman' to eslintrc

* brace style, comment fixes and default arg

* brace style fixes

* more brace styles

* Point default args

* Point brace styles

* Observable Point default args

* more brace styles

* jsdoc comment style

* brace style

* brace styles and small jsdoc fix

* brace styles

* removed unneeded eslint inline comment

* brace styles; lint free

# Conflicts:
#	src/accessibility/AccessibilityManager.js
#	src/core/text/Text.js

* some more es6 changes
- const instead of let if possible
- arrow functions
- string templates
- argument defaults

* object property shorthand

* some more es6 changes
- const instead of let if possible
- arrow functions
- string templates
- argument defaults

* Revert "Merge branch 'dev-es6-sb' of github.com:stbaer/pixi.js into dev-es6-sb"

This reverts commit 8d3af81, reversing
changes made to e8b9948.

* Revert "Merge branch 'dev-es6' into dev-es6-sb"

This reverts commit 3eeaf79, reversing
changes made to fb69536.

* Revert "Revert "Merge branch 'dev-es6-sb' of github.com:stbaer/pixi.js into dev-es6-sb""

This reverts commit c860228.

* fix RenderTexture, incomplete merge

* fix for text font properties

* reverted some changes

* checked out License, Readme and Contributinf from dev-es6

* editorconfig updated: 2 spaces for .eslintrc

* added eslint rule: spaces around fat arrow

* used eslint fix for consistent spaces around fat arrow

* don't allow scale.x or scale.y to be 0 in displayObject setTransform

* removed jshint comments (again)

- Removed some require references that were preventing mixins like
interaction from working.
- Fixed Text

* Migration to ES6 classes

* Migration to ES6 classes

* Migration to ES6 classes

* Migration to ES6 classes

* Using babelify to transpile ES6 code

* Adding babel-preset-es2015 in devDependencies

Do not create touch hooks for accessibility - this stops cocoon from working
Do not use gradient text, just use the first colour listed in the array - cocoon displays text with gradients as black otherwise

Text width was being incorrectly reported when padding is used

also added a unit test