melonjs 9.1.0 → 10.0.1

package/src/text/text.js

@@ -1,7 +1,7 @@
 import Color from "./../math/color.js";
 import Renderer from "./../video/renderer.js";
-import video from "./../video/video.js";
-import utils from "./../utils/utils.js";
+import { renderer } from "./../video/video.js";
+import * as stringUtil from "./../utils/string.js";
 import pool from "./../system/pooling.js";
 import Renderable from "./../renderable/renderable.js";
 
@@ -55,12 +55,17 @@ var setContextStyle = function(context, font, stroke) {
  * @example
  * var font = new me.Text(0, 0, {font: "Arial", size: 8, fillStyle: this.color});
  */
-var Text = Renderable.extend({
+class Text extends Renderable {
 
     /** @ignore */
-    init : function (x, y, settings) {
+    constructor(x, y, settings) {
         // call the parent constructor
-        this._super(Renderable, "init", [x, y, settings.width || 0, settings.height || 0]);
+        super(x, y, settings.width || 0, settings.height || 0);
+        this.onResetEvent(x, y, settings);
+    }
+
+    /** @ignore */
+    onResetEvent(x, y, settings) {
 
         /**
          * defines the color used to draw the font.<br>
@@ -181,7 +186,7 @@ var Text = Renderable.extend({
 
         // set the text
         this.setText(settings.text);
-    },
+    }
 
     /**
      * make the font bold
@@ -190,11 +195,11 @@ var Text = Renderable.extend({
      * @function
      * @return this object for chaining
      */
-    bold : function () {
+    bold() {
         this.font = "bold " + this.font;
         this.isDirty = true;
         return this;
-    },
+    }
 
     /**
      * make the font italic
@@ -203,11 +208,11 @@ var Text = Renderable.extend({
      * @function
      * @return this object for chaining
      */
-    italic : function () {
+    italic() {
         this.font = "italic " + this.font;
         this.isDirty = true;
         return this;
-    },
+    }
 
     /**
      * set the font family and size
@@ -221,7 +226,7 @@ var Text = Renderable.extend({
      * font.setFont("Arial", 20);
      * font.setFont("Arial", "1.5em");
      */
-    setFont : function (font, size) {
+    setFont(font, size) {
         // font name and type
         var font_names = font.split(",").map(function (value) {
             value = value.trim();
@@ -251,7 +256,7 @@ var Text = Renderable.extend({
         this.isDirty = true;
 
         return this;
-    },
+    }
 
     /**
      * change the text to be displayed
@@ -261,7 +266,7 @@ var Text = Renderable.extend({
      * @param {Number|String|String[]} value a string, or an array of strings
      * @return this object for chaining
      */
-    setText : function (value) {
+    setText(value) {
         if (typeof value === "undefined") {
             value = "";
         }
@@ -276,7 +281,7 @@ var Text = Renderable.extend({
         }
 
         return this;
-    },
+    }
 
     /**
      * measure the given text size in pixels
@@ -288,16 +293,16 @@ var Text = Renderable.extend({
      * @param {me.Rect|me.Bounds} [ret] a object in which to store the text metrics
      * @returns {TextMetrics} a TextMetrics object with two properties: `width` and `height`, defining the output dimensions
      */
-    measureText : function (renderer, text, ret) {
+    measureText(_renderer, text, ret) {
         var context;
 
-        if (typeof renderer === "undefined") {
-            context = video.renderer.getFontContext();
-        } else if (renderer instanceof Renderer) {
+        if (typeof _renderer === "undefined") {
             context = renderer.getFontContext();
+        } else if (_renderer instanceof Renderer) {
+            context = _renderer.getFontContext();
         } else {
             // else it's a 2d rendering context object
-            context = renderer;
+            context = _renderer;
         }
 
         var textMetrics = ret || this.getBounds();
@@ -314,7 +319,7 @@ var Text = Renderable.extend({
         // compute the bounding box size
         this.height = this.width = 0;
         for (var i = 0; i < strings.length; i++) {
-            this.width = Math.max(context.measureText(utils.string.trimRight(""+strings[i])).width, this.width);
+            this.width = Math.max(context.measureText(stringUtil.trimRight(""+strings[i])).width, this.width);
             this.height += lineHeight;
         }
         textMetrics.width = Math.ceil(this.width);
@@ -333,17 +338,17 @@ var Text = Renderable.extend({
 
         // returns the Font bounds me.Rect by default
         return textMetrics;
-    },
+    }
 
     /**
      * @ignore
      */
-    update : function (/* dt */) {
+    update(/* dt */) {
         if (this.isDirty === true) {
             this.measureText();
         }
         return this.isDirty;
-    },
+    }
 
     /**
      * draw a text at the specified coord
@@ -355,7 +360,7 @@ var Text = Renderable.extend({
      * @param {Number} [x]
      * @param {Number} [y]
      */
-    draw : function (renderer, text, x, y, stroke) {
+    draw(renderer, text, x, y, stroke) {
         // "hacky patch" for backward compatibilty
         if (typeof this.ancestor === "undefined") {
             // update text cache
@@ -401,7 +406,7 @@ var Text = Renderable.extend({
         // clear the dirty flag here for
         // backward compatibility
         this.isDirty = false;
-    },
+    }
 
     /**
      * draw a stroke text at the specified coord, as defined <br>
@@ -415,38 +420,38 @@ var Text = Renderable.extend({
      * @param {Number} x
      * @param {Number} y
      */
-    drawStroke : function (renderer, text, x, y) {
-        this.draw.call(this, renderer, text, x, y, true);
-    },
+    drawStroke(renderer, text, x, y) {
+        this.draw(renderer, text, x, y, true);
+    }
 
     /**
      * @ignore
      */
-    _drawFont : function (context, text, x, y, stroke) {
+    _drawFont(context, text, x, y, stroke) {
         setContextStyle(context, this, stroke);
 
         var lineHeight = this.fontSize * this.lineHeight;
         for (var i = 0; i < text.length; i++) {
-            var string = utils.string.trimRight(""+text[i]);
+            var string = stringUtil.trimRight(""+text[i]);
             // draw the string
             context[stroke ? "strokeText" : "fillText"](string, x, y);
             // add leading space
             y += lineHeight;
         }
         return this.getBounds();
-    },
+    }
 
     /**
      * Destroy function
      * @ignore
      */
-    destroy : function () {
+    destroy() {
         pool.push(this.fillStyle);
         pool.push(this.strokeStyle);
         this.fillStyle = this.strokeStyle = undefined;
         this._text.length = 0;
-        this._super(Renderable, "destroy");
+        super.destroy();
     }
-});
+};
 
 export default Text;

package/src/tweens/easing.js

@@ -325,5 +325,3 @@ export let Easing = {
     }
 
 };
-
-/* eslint-enable quotes, keyword-spacing, comma-spacing, no-return-assign */

package/src/tweens/interpolation.js

@@ -3,8 +3,6 @@
 * https://github.com/tweenjs/tween.js
 */
 
-/* eslint-disable quotes, keyword-spacing, comma-spacing, no-return-assign */
-
 /**
  * Interpolation Function :<br>
  * <p>
@@ -72,7 +70,7 @@ export let Interpolation = {
 
         },
         /** @ignore */
-        Bernstein: function ( n , i ) {
+        Bernstein: function ( n, i ) {
 
             var fc = Interpolation.Utils.Factorial;
             return fc( n ) / fc( i ) / fc( n - i );
@@ -88,7 +86,8 @@ export let Interpolation = {
                 var s = 1, i;
                 if ( a[ n ] ) return a[ n ];
                 for ( i = n; i > 1; i-- ) s *= i;
-                return a[ n ] = s;
+                a[ n ] = s;
+                return s;
 
             };
 
@@ -98,11 +97,7 @@ export let Interpolation = {
 
             var v0 = ( p2 - p0 ) * 0.5, v1 = ( p3 - p1 ) * 0.5, t2 = t * t, t3 = t * t2;
             return ( 2 * p1 - 2 * p2 + v0 + v1 ) * t3 + ( - 3 * p1 + 3 * p2 - 2 * v0 - v1 ) * t2 + v0 * t + p1;
-
         }
-
     }
 
 };
-
-/* eslint-enable quotes, keyword-spacing, comma-spacing, no-return-assign */