From 836bf158b9afbf53de10e0f792ffc80012956f30 Mon Sep 17 00:00:00 2001 From: Asturur Date: Sat, 12 Aug 2017 13:48:01 +0200 Subject: [PATCH] setAngle => rotate --- src/canvas.class.js | 2 +- src/mixins/object_straightening.mixin.js | 4 ++-- src/shapes/object.class.js | 11 ++--------- src/static_canvas.class.js | 2 +- src/util/misc.js | 2 +- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/canvas.class.js b/src/canvas.class.js index 8d9de4a4..45aebc3b 100644 --- a/src/canvas.class.js +++ b/src/canvas.class.js @@ -1032,7 +1032,7 @@ target.scaleY = 1; target.skewX = 0; target.skewY = 0; - target.setAngle(0); + target.rotate(0); }, /** diff --git a/src/mixins/object_straightening.mixin.js b/src/mixins/object_straightening.mixin.js index 2e6e2683..d4dbcfef 100644 --- a/src/mixins/object_straightening.mixin.js +++ b/src/mixins/object_straightening.mixin.js @@ -18,7 +18,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot * @chainable */ straighten: function() { - this.setAngle(this._getAngleValueForStraighten()); + this.rotate(this._getAngleValueForStraighten()); return this; }, @@ -43,7 +43,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot endValue: this._getAngleValueForStraighten(), duration: this.FX_DURATION, onChange: function(value) { - _this.setAngle(value); + _this.rotate(value); onChange(); }, onComplete: function() { diff --git a/src/shapes/object.class.js b/src/shapes/object.class.js index 0edfccf9..cbf9d3fa 100644 --- a/src/shapes/object.class.js +++ b/src/shapes/object.class.js @@ -1576,12 +1576,12 @@ }, /** - * Sets "angle" of an instance + * Sets "angle" of an instance with centered rotation * @param {Number} angle Angle value (in degrees) * @return {fabric.Object} thisArg * @chainable */ - setAngle: function(angle) { + rotate: function(angle) { var shouldCenterOrigin = (this.originX !== 'center' || this.originY !== 'center') && this.centeredRotation; if (shouldCenterOrigin) { @@ -1707,13 +1707,6 @@ fabric.util.createAccessors && fabric.util.createAccessors(fabric.Object); - /** - * Alias for {@link fabric.Object.prototype.setAngle} - * @alias rotate -> setAngle - * @memberOf fabric.Object - */ - fabric.Object.prototype.rotate = fabric.Object.prototype.setAngle; - extend(fabric.Object.prototype, fabric.Observable); /** diff --git a/src/static_canvas.class.js b/src/static_canvas.class.js index 6a02f6a2..5faf4fb4 100644 --- a/src/static_canvas.class.js +++ b/src/static_canvas.class.js @@ -1070,7 +1070,7 @@ */ _centerObject: function(object, center) { object.setPositionByOrigin(center, 'center', 'center'); - this.requestRenderAll(); + this.renderOnAddRemove && this.requestRenderAll(); return this; }, diff --git a/src/util/misc.js b/src/util/misc.js index 96ed0112..72870481 100644 --- a/src/util/misc.js +++ b/src/util/misc.js @@ -557,7 +557,7 @@ target.skewY = 0; target.flipX = false; target.flipY = false; - target.setAngle(0); + target.rotate(0); }, /**