github/scratch-render
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use this inside => callbacks

Browse Source 
Some callbacks used a variable called `instance` to stash `this` for use
inside the callback. Now that those callbacks have been converted from
`function` to `=>`, they can just use `this` instead.
This commit is contained in:
Christopher Willis-Ford 2016-12-13 15:51:46 -08:00
parent b700560198
commit d1ea82b2bf
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Drawable.js
View File

@ -209,7 +209,6 @@ class Drawable {
*/
_setSkinSVG (skinMd5ext) {
const url = skinMd5ext;
const instance = this;
const svgCanvas = document.createElement('canvas');
const svgRenderer = new SvgRenderer(svgCanvas);
@ -217,7 +216,7 @@ class Drawable {
const gotSVG = (err, response, body) => {
if (!err) {
svgRenderer.fromString(body, () => {
instance._setSkinCore(svgCanvas, svgRenderer.getDrawRatio());
this._setSkinCore(svgCanvas, svgRenderer.getDrawRatio());
});
}
};
@ -235,10 +234,9 @@ class Drawable {
* @private
*/
_setSkinCore (source, costumeResolution) {
const instance = this;
const callback = (err, texture, sourceInCallback) => {
if (!err && (instance._pendingSkin === texture)) {
instance._useSkin(texture, sourceInCallback.width, sourceInCallback.height, costumeResolution);
if (!err && (this._pendingSkin === texture)) {
this._useSkin(texture, sourceInCallback.width, sourceInCallback.height, costumeResolution);
}
};
@ -251,12 +249,12 @@ class Drawable {
src: source
};
const willCallCallback = typeof source === 'string';
instance._pendingSkin = twgl.createTexture(gl, options, willCallCallback ? callback : null);
this._pendingSkin = twgl.createTexture(gl, options, willCallCallback ? callback : null);
// If we won't get a callback, start using the skin immediately.
// This will happen if the data is already local.
if (!willCallCallback) {
callback(null, instance._pendingSkin, source);
callback(null, this._pendingSkin, source);
}
}