var let const

src/shapes/Path.ts

@@ -544,8 +544,8 @@ export class Path extends Shape<PathConfig> {
         const startX = cpx,
           startY = cpy;
         // Move var from within the switch to up here (jshint)
-        var prevCmd, ctlPtx, ctlPty; // Ss, Tt
+        let prevCmd, ctlPtx, ctlPty; // Ss, Tt
-        var rx, ry, psi, fa, fs, x1, y1; // Aa
+        let rx, ry, psi, fa, fs, x1, y1; // Aa
 
         // convert l, H, h, V, and v to L
         switch (c) {
@@ -563,8 +563,8 @@ export class Path extends Shape<PathConfig> {
             break;
           // Note: lineTo handlers need to be above this point
           case 'm':
-            var dx = p.shift()!;
+            const dx = p.shift()!;
-            var dy = p.shift()!;
+            const dy = p.shift()!;
             cpx += dx;
             cpy += dy;
             cmd = 'M';
@@ -790,12 +790,12 @@ export class Path extends Shape<PathConfig> {
       case 'A':
         // Approximates by breaking curve into line segments
         len = 0.0;
-        var start = points[4];
+        const start = points[4];
         // 4 = theta
-        var dTheta = points[5];
+        const dTheta = points[5];
         // 5 = dTheta
-        var end = points[4] + dTheta;
+        const end = points[4] + dTheta;
-        var inc = Math.PI / 180.0;
+        let inc = Math.PI / 180.0;
         // 1 degree resolution
         if (Math.abs(start - end) < inc) {
           inc = Math.abs(start - end);

src/shapes/Transformer.ts

@@ -770,11 +770,11 @@ export class Transformer extends Group {
       keepProportion = this.keepRatio() || e.shiftKey;
     }
 
-    var centeredScaling = this.centeredScaling() || e.altKey;
+    let centeredScaling = this.centeredScaling() || e.altKey;
 
     if (this._movingAnchorName === 'top-left') {
       if (keepProportion) {
-        var comparePoint = centeredScaling
+        const comparePoint = centeredScaling
           ? {
               x: this.width() / 2,
               y: this.height() / 2,
@@ -788,9 +788,9 @@ export class Transformer extends Group {
             Math.pow(comparePoint.y - anchorNode.y(), 2)
         );
 
-        var reverseX = this.findOne('.top-left')!.x() > comparePoint.x ? -1 : 1;
+        const reverseX = this.findOne('.top-left')!.x() > comparePoint.x ? -1 : 1;
 
-        var reverseY = this.findOne('.top-left')!.y() > comparePoint.y ? -1 : 1;
+        const reverseY = this.findOne('.top-left')!.y() > comparePoint.y ? -1 : 1;
 
         x = newHypotenuse * this.cos * reverseX;
         y = newHypotenuse * this.sin * reverseY;
@@ -802,7 +802,7 @@ export class Transformer extends Group {
       this.findOne('.top-left')!.y(anchorNode.y());
     } else if (this._movingAnchorName === 'top-right') {
       if (keepProportion) {
-        var comparePoint = centeredScaling
+        const comparePoint = centeredScaling
           ? {
               x: this.width() / 2,
               y: this.height() / 2,
@@ -817,10 +817,10 @@ export class Transformer extends Group {
             Math.pow(comparePoint.y - anchorNode.y(), 2)
         );
 
-        var reverseX =
+        const reverseX =
           this.findOne('.top-right')!.x() < comparePoint.x ? -1 : 1;
 
-        var reverseY =
+        const reverseY =
           this.findOne('.top-right')!.y() > comparePoint.y ? -1 : 1;
 
         x = newHypotenuse * this.cos * reverseX;
@@ -838,7 +838,7 @@ export class Transformer extends Group {
       this.findOne('.bottom-right')!.x(anchorNode.x());
     } else if (this._movingAnchorName === 'bottom-left') {
       if (keepProportion) {
-        var comparePoint = centeredScaling
+        const comparePoint = centeredScaling
           ? {
               x: this.width() / 2,
               y: this.height() / 2,
@@ -853,9 +853,9 @@ export class Transformer extends Group {
             Math.pow(anchorNode.y() - comparePoint.y, 2)
         );
 
-        var reverseX = comparePoint.x < anchorNode.x() ? -1 : 1;
+        const reverseX = comparePoint.x < anchorNode.x() ? -1 : 1;
 
-        var reverseY = anchorNode.y() < comparePoint.y ? -1 : 1;
+        const reverseY = anchorNode.y() < comparePoint.y ? -1 : 1;
 
         x = newHypotenuse * this.cos * reverseX;
         y = newHypotenuse * this.sin * reverseY;
@@ -872,7 +872,7 @@ export class Transformer extends Group {
       this.findOne('.bottom-right')!.y(anchorNode.y());
     } else if (this._movingAnchorName === 'bottom-right') {
       if (keepProportion) {
-        var comparePoint = centeredScaling
+        const comparePoint = centeredScaling
           ? {
               x: this.width() / 2,
               y: this.height() / 2,
@@ -887,10 +887,10 @@ export class Transformer extends Group {
             Math.pow(anchorNode.y() - comparePoint.y, 2)
         );
 
-        var reverseX =
+        const reverseX =
           this.findOne('.bottom-right')!.x() < comparePoint.x ? -1 : 1;
 
-        var reverseY =
+        const reverseY =
           this.findOne('.bottom-right')!.y() < comparePoint.y ? -1 : 1;
 
         x = newHypotenuse * this.cos * reverseX;
@@ -908,7 +908,7 @@ export class Transformer extends Group {
       );
     }
 
-    var centeredScaling = this.centeredScaling() || e.altKey;
+    centeredScaling = this.centeredScaling() || e.altKey;
     if (centeredScaling) {
       const topLeft = this.findOne('.top-left')!;
       const bottomRight = this.findOne('.bottom-right')!;

test/unit/imagediff.ts

@@ -57,19 +57,16 @@ function isType(object, type) {
 
 // Type Conversion
 function copyImageData(imageData) {
-  var height = imageData.height,
+  const height = imageData.height,
     width = imageData.width,
-    data = imageData.data,
+    data = imageData.data;
-    newImageData,
-    newData,
-    i;
 
   canvas.width = width;
   canvas.height = height;
-  newImageData = context.getImageData(0, 0, width, height);
+  const newImageData = context.getImageData(0, 0, width, height);
-  newData = newImageData.data;
+  const newData = newImageData.data;
 
-  for (i = imageData.data.length; i--; ) {
+  for (let i = imageData.data.length; i--; ) {
     newData[i] = data[i];
   }
 
@@ -90,7 +87,7 @@ function toImageData(object) {
   }
 }
 function toImageDataFromImage(image) {
-  var height = image.height,
+  const height = image.height,
     width = image.width;
   canvas.width = width;
   canvas.height = height;
@@ -99,7 +96,7 @@ function toImageDataFromImage(image) {
   return context.getImageData(0, 0, width, height);
 }
 function toImageDataFromCanvas(canvas) {
-  var height = canvas.height,
+  const height = canvas.height,
     width = canvas.width,
     context = canvas.getContext('2d');
   if (!width || !height) {
@@ -109,13 +106,13 @@ function toImageDataFromCanvas(canvas) {
   return context.getImageData(0, 0, width, height);
 }
 function toImageDataFromContext(context) {
-  var canvas = context.canvas,
+  const canvas = context.canvas,
     height = canvas.height,
     width = canvas.width;
   return context.getImageData(0, 0, width, height);
 }
 function toCanvas(object) {
-  var data = toImageData(object),
+  const data = toImageData(object),
     canvas = getCanvas(data.width, data.height),
     context = canvas.getContext('2d');
 
@@ -135,16 +132,15 @@ function equalDimensions(a, b) {
 }
 
 export function equal(a, b, tolerance, secondTol) {
-  var aData = a.data,
+  const aData = a.data,
     bData = b.data,
-    length = aData.length,
+    length = aData.length;
-    i;
 
   tolerance = tolerance || 0;
 
-  var count = 0;
+  let count = 0;
   if (!equalDimensions(a, b)) return false;
-  for (i = length; i--; ) {
+  for (let i = length; i--; ) {
     const d = Math.abs(aData[i] - bData[i]);
     if (aData[i] !== bData[i] && d > tolerance) {
       if (!secondTol) {
@@ -168,21 +164,15 @@ function diff(a, b, options) {
   return (equalDimensions(a, b) ? diffEqual : diffUnequal)(a, b, options);
 }
 function diffEqual(a, b, options) {
-  var height = a.height,
+  const height = a.height,
     width = a.width,
     c = getImageData(width, height), // c = a - b
     aData = a.data,
     bData = b.data,
     cData = c.data,
-    length = cData.length,
+    length = cData.length;
-    row,
-    column,
-    i,
-    j,
-    k,
-    v;
 
-  for (i = 0; i < length; i += 4) {
+  for (let i = 0; i < length; i += 4) {
     cData[i] = Math.abs(aData[i] - bData[i]);
     cData[i + 1] = Math.abs(aData[i + 1] - bData[i + 1]);
     cData[i + 2] = Math.abs(aData[i + 2] - bData[i + 2]);
@@ -192,32 +182,26 @@ function diffEqual(a, b, options) {
   return c;
 }
 function diffUnequal(a, b, options) {
-  var height = Math.max(a.height, b.height),
+  const height = Math.max(a.height, b.height),
     width = Math.max(a.width, b.width),
     c = getImageData(width, height), // c = a - b
     aData = a.data,
     bData = b.data,
     cData = c.data,
-    align = options && options.align,
+    align = options && options.align;
-    rowOffset,
+  var rowOffset,
-    columnOffset,
+    columnOffset;
-    row,
-    column,
-    i,
-    j,
-    k,
-    v;
 
-  for (i = cData.length - 1; i > 0; i = i - 4) {
+  for (let i = cData.length - 1; i > 0; i = i - 4) {
     cData[i] = 255;
   }
 
   // Add First Image
   offsets(a);
-  for (row = a.height; row--; ) {
+  for (let row = a.height; row--; ) {
-    for (column = a.width; column--; ) {
+    for (let column = a.width; column--; ) {
-      i = 4 * ((row + rowOffset) * width + (column + columnOffset));
+      const i = 4 * ((row + rowOffset) * width + (column + columnOffset));
-      j = 4 * (row * a.width + column);
+      const j = 4 * (row * a.width + column);
       cData[i + 0] = aData[j + 0]; // r
       cData[i + 1] = aData[j + 1]; // g
       cData[i + 2] = aData[j + 2]; // b
@@ -227,10 +211,10 @@ function diffUnequal(a, b, options) {
 
   // Subtract Second Image
   offsets(b);
-  for (row = b.height; row--; ) {
+  for (let row = b.height; row--; ) {
-    for (column = b.width; column--; ) {
+    for (let column = b.width; column--; ) {
-      i = 4 * ((row + rowOffset) * width + (column + columnOffset));
+      const i = 4 * ((row + rowOffset) * width + (column + columnOffset));
-      j = 4 * (row * b.width + column);
+      const j = 4 * (row * b.width + column);
       cData[i + 0] = Math.abs(cData[i + 0] - bData[j + 0]); // r
       cData[i + 1] = Math.abs(cData[i + 1] - bData[j + 1]); // g
       cData[i + 2] = Math.abs(cData[i + 2] - bData[j + 2]); // b
@@ -253,8 +237,7 @@ function diffUnequal(a, b, options) {
 
 // Validation
 function checkType(...args) {
-  var i;
+  for (let i = 0; i < args.length; i++) {
-  for (i = 0; i < args.length; i++) {
     if (!isImageType(args[i])) {
       throw {
         name: 'ImageTypeError',