From 009c5389bf7f0306f9648cd6159d687e738654f5 Mon Sep 17 00:00:00 2001 From: Tom French Date: Sat, 31 May 2014 18:08:33 +0100 Subject: [PATCH] JSHint, restoring .gitignore --- .gitignore | 5 ++++ src/brushes/spray_brush.class.js | 2 +- src/mixins/canvas_events.mixin.js | 10 +++----- src/mixins/object_geometry.mixin.js | 31 ++++++++++++------------ src/mixins/object_interactivity.mixin.js | 2 -- src/static_canvas.class.js | 8 +++--- src/util/misc.js | 2 +- 7 files changed, 29 insertions(+), 31 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..06b77a9a --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.DS_Store +/node_modules/ +/npm-debug.log +before_commit +/coverage/ diff --git a/src/brushes/spray_brush.class.js b/src/brushes/spray_brush.class.js index ad75c16d..afd9ce26 100644 --- a/src/brushes/spray_brush.class.js +++ b/src/brushes/spray_brush.class.js @@ -187,7 +187,7 @@ fabric.SprayBrush = fabric.util.createClass( fabric.BaseBrush, /** @lends fabric } var point = new fabric.Point(x, y); - point.width = width + point.width = width; if (this.randomOpacity) { point.opacity = fabric.util.getRandomInt(0, 100) / 100; diff --git a/src/mixins/canvas_events.mixin.js b/src/mixins/canvas_events.mixin.js index 0d008997..a469bc4c 100644 --- a/src/mixins/canvas_events.mixin.js +++ b/src/mixins/canvas_events.mixin.js @@ -346,8 +346,8 @@ */ _onMouseMoveInDrawingMode: function(e) { if (this._isCurrentlyDrawing) { - var ivt = fabric.util.invertTransform(this.viewportTransform); - pointer = fabric.util.transformPoint(this.getPointer(e, true), ivt); + var ivt = fabric.util.invertTransform(this.viewportTransform), + pointer = fabric.util.transformPoint(this.getPointer(e, true), ivt); this.freeDrawingBrush.onMouseMove(pointer); } this.upperCanvasEl.style.cursor = this.freeDrawingCursor; @@ -548,11 +548,7 @@ * @param {Event} e Event fired on mousemove */ _transformObject: function(e) { - var pointer = fabric.util.transformPoint( - fabric.util.getPointer(e, this.upperCanvasEl), - fabric.util.invertTransform(this.viewportTransform) - ), - pointer = this.getPointer(e), + var pointer = this.getPointer(e), transform = this._currentTransform; transform.reset = false, diff --git a/src/mixins/object_geometry.mixin.js b/src/mixins/object_geometry.mixin.js index d393b29c..30e18c1f 100644 --- a/src/mixins/object_geometry.mixin.js +++ b/src/mixins/object_geometry.mixin.js @@ -304,13 +304,12 @@ setCoords: function() { var strokeWidth = this.strokeWidth > 1 ? this.strokeWidth : 0, - padding = this.padding, theta = degreesToRadians(this.angle), vpt = this.getViewportTransform(); var f = function (p) { return fabric.util.transformPoint(p, vpt); - } + }; this.currentWidth = (this.width + strokeWidth) * this.scaleX; this.currentHeight = (this.height + strokeWidth) * this.scaleY; @@ -332,20 +331,20 @@ sinTh = Math.sin(theta), cosTh = Math.cos(theta), coords = this.getCenterPoint(), - wh = new fabric.Point(this.currentWidth, this.currentHeight); - var _tl = new fabric.Point(coords.x - offsetX, coords.y - offsetY); - var _tr = new fabric.Point(_tl.x + (wh.x * cosTh), _tl.y + (wh.x * sinTh)); - var _bl = new fabric.Point(_tl.x - (wh.y * sinTh), _tl.y + (wh.y * cosTh)); - var _mt = new fabric.Point(_tl.x + (wh.x/2 * cosTh), _tl.y + (wh.x/2 * sinTh)); - var tl = f(_tl); - var tr = f(_tr); - var br = f(new fabric.Point(_tr.x - (wh.y * sinTh), _tr.y + (wh.y * cosTh))); - var bl = f(_bl); - var ml = f(new fabric.Point(_tl.x - (wh.y/2 * sinTh), _tl.y + (wh.y/2 * cosTh))); - var mt = f(_mt); - var mr = f(new fabric.Point(_tr.x - (wh.y/2 * sinTh), _tr.y + (wh.y/2 * cosTh))); - var mb = f(new fabric.Point(_bl.x + (wh.x/2 * cosTh), _bl.y + (wh.x/2 * sinTh))); - var mtr = f(new fabric.Point(_mt.x, _mt.y)); + wh = new fabric.Point(this.currentWidth, this.currentHeight), + _tl = new fabric.Point(coords.x - offsetX, coords.y - offsetY), + _tr = new fabric.Point(_tl.x + (wh.x * cosTh), _tl.y + (wh.x * sinTh)), + _bl = new fabric.Point(_tl.x - (wh.y * sinTh), _tl.y + (wh.y * cosTh)), + _mt = new fabric.Point(_tl.x + (wh.x/2 * cosTh), _tl.y + (wh.x/2 * sinTh)), + tl = f(_tl), + tr = f(_tr), + br = f(new fabric.Point(_tr.x - (wh.y * sinTh), _tr.y + (wh.y * cosTh))), + bl = f(_bl), + ml = f(new fabric.Point(_tl.x - (wh.y/2 * sinTh), _tl.y + (wh.y/2 * cosTh))), + mt = f(_mt), + mr = f(new fabric.Point(_tr.x - (wh.y/2 * sinTh), _tr.y + (wh.y/2 * cosTh))), + mb = f(new fabric.Point(_bl.x + (wh.x/2 * cosTh), _bl.y + (wh.x/2 * sinTh))), + mtr = f(new fabric.Point(_mt.x, _mt.y)); // padding var padX = Math.cos(_angle + theta) * this.padding * Math.sqrt(2), diff --git a/src/mixins/object_interactivity.mixin.js b/src/mixins/object_interactivity.mixin.js index de15029d..30e5824a 100644 --- a/src/mixins/object_interactivity.mixin.js +++ b/src/mixins/object_interactivity.mixin.js @@ -333,8 +333,6 @@ height = wh.y, left = -(width / 2), top = -(height / 2), - _left, - _top, padding = this.padding, scaleOffset = size2, scaleOffsetSize = size2 - size, diff --git a/src/static_canvas.class.js b/src/static_canvas.class.js index ca998686..85c5c44b 100644 --- a/src/static_canvas.class.js +++ b/src/static_canvas.class.js @@ -538,7 +538,7 @@ * @return {Number} */ getZoom: function () { - return sqrt(this.viewportTransform[0] * this.viewportTransform[3]); + return Math.sqrt(this.viewportTransform[0] * this.viewportTransform[3]); }, /** @@ -553,7 +553,7 @@ x = this.viewportTransform[4], y = this.viewportTransform[5]; - return new fabric.Point(this.getWidth()/2 + x, this.getHeight()/2 + y); + return new fabric.Point(wh.x + x, wh.y + y); }, /** @@ -563,7 +563,7 @@ * @chainable true */ setViewportTransform: function (vpt) { - this.viewportTransform = vpt + this.viewportTransform = vpt; this.renderAll(); for (var i = 0, len = this._objects.length; i < len; i++) { this._objects[i].setCoords(); @@ -676,7 +676,7 @@ obj._objects[i].canvas = this; this._onObjectAdded(obj._objects[i]); } - obj._updateObjectsCoords() + obj._updateObjectsCoords(); } obj.setCoords(); this.fire('object:added', { target: obj }); diff --git a/src/util/misc.js b/src/util/misc.js index 0bd8e2ca..60a07ee5 100644 --- a/src/util/misc.js +++ b/src/util/misc.js @@ -117,7 +117,7 @@ var o = fabric.util.transformPoint({x: t[4], y: t[5]}, r); r[4] = -o.x; r[5] = -o.y; - return r + return r; }, /**