From abf3133c362d96511009e8987f37cb5858a135da Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Wed, 2 Sep 2015 21:28:57 +0200 Subject: [PATCH 1/3] Update rect.js --- test/unit/rect.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/unit/rect.js b/test/unit/rect.js index 3771b530d80..78c65e07672 100644 --- a/test/unit/rect.js +++ b/test/unit/rect.js @@ -28,8 +28,6 @@ 'fillRule': 'nonzero', 'globalCompositeOperation': 'source-over', 'transformMatrix': null, - 'skewX': 0, - 'skewY': 0, 'rx': 0, 'ry': 0, }; @@ -104,7 +102,6 @@ elRectWithAttrs.setAttribute('stroke-linecap', 'round'); elRectWithAttrs.setAttribute('stroke-linejoin', 'bevil'); elRectWithAttrs.setAttribute('stroke-miterlimit', 5); - elRectWithAttrs.setAttribute('skewX', 30); //elRectWithAttrs.setAttribute('transform', 'translate(-10,-20) scale(2) rotate(45) translate(5,10)'); var rectWithAttrs = fabric.Rect.fromElement(elRectWithAttrs); @@ -123,7 +120,6 @@ strokeLineCap: 'round', strokeLineJoin: 'bevil', strokeMiterLimit: 5, - skewX: 30, rx: 11, ry: 12 }); From bbae1aa9f644a99f5e9a4432e04a3e4ef49952f6 Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Sat, 19 Sep 2015 08:25:17 +0200 Subject: [PATCH 2/3] Add gradient transform to toObject method --- src/gradient.class.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gradient.class.js b/src/gradient.class.js index 1f7c8a8a40d..fd09149e6cd 100644 --- a/src/gradient.class.js +++ b/src/gradient.class.js @@ -153,7 +153,8 @@ coords: this.coords, colorStops: this.colorStops, offsetX: this.offsetX, - offsetY: this.offsetY + offsetY: this.offsetY, + gradientTransform: this.gradientTransform ? this.gradientTransform.concat() : this.gradientTransform }; }, From 436ce5a70cb4d34e0f125f107a4c6e9c9561ef69 Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Sat, 19 Sep 2015 08:27:28 +0200 Subject: [PATCH 3/3] add test for gradient Transform --- test/unit/gradient.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/gradient.js b/test/unit/gradient.js index cdf4cf9c5fe..4aee8893003 100644 --- a/test/unit/gradient.js +++ b/test/unit/gradient.js @@ -92,7 +92,7 @@ test('toObject linearGradient', function() { var gradient = createLinearGradient(); - + gradient.gradientTransform = [1, 0, 0, 1, 50, 50]; ok(typeof gradient.toObject == 'function'); var object = gradient.toObject(); @@ -103,7 +103,7 @@ equal(object.coords.y2, gradient.coords.y2); equal(object.type, gradient.type); - + deepEqual(object.gradientTransform, gradient.gradientTransform); equal(object.colorStops, gradient.colorStops); });