From a7f233c8f39c0727d088ca2e170d83291dc53ead Mon Sep 17 00:00:00 2001 From: Thomas R Kaltz III Date: Tue, 30 Dec 2014 01:20:53 -0500 Subject: [PATCH 1/3] Allow the use of lineDashArray with the free drawing tool. --- src/brushes/base_brush.class.js | 8 ++++++++ src/brushes/pencil_brush.class.js | 1 + 2 files changed, 9 insertions(+) diff --git a/src/brushes/base_brush.class.js b/src/brushes/base_brush.class.js index ca22f125..8cc5fb37 100644 --- a/src/brushes/base_brush.class.js +++ b/src/brushes/base_brush.class.js @@ -42,6 +42,13 @@ fabric.BaseBrush = fabric.util.createClass(/** @lends fabric.BaseBrush.prototype */ strokeLineJoin: 'round', + /** + * Line Dash Array. + * @type Array + * @default + */ + lineDashArray: [0,0], + /** * Sets shadow of an object * @param {Object|String} [options] Options object or string (e.g. "2px 2px 10px rgba(0,0,0,0.2)") @@ -64,6 +71,7 @@ fabric.BaseBrush = fabric.util.createClass(/** @lends fabric.BaseBrush.prototype ctx.lineWidth = this.width; ctx.lineCap = this.strokeLineCap; ctx.lineJoin = this.strokeLineJoin; + ctx.setLineDash(this.lineDashArray); }, /** diff --git a/src/brushes/pencil_brush.class.js b/src/brushes/pencil_brush.class.js index 4286aabc..d596f95a 100644 --- a/src/brushes/pencil_brush.class.js +++ b/src/brushes/pencil_brush.class.js @@ -171,6 +171,7 @@ strokeWidth: this.width, strokeLineCap: this.strokeLineCap, strokeLineJoin: this.strokeLineJoin, + strokeDashArray: this.lineDashArray, originX: 'center', originY: 'center' }); From 092c81272e101aefe93169374cc71c7a895cf2f5 Mon Sep 17 00:00:00 2001 From: Thomas Kaltz III Date: Thu, 15 Jan 2015 13:36:26 -0800 Subject: [PATCH 2/3] Rename to strokeDashArray and default to null --- src/brushes/base_brush.class.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/brushes/base_brush.class.js b/src/brushes/base_brush.class.js index 8cc5fb37..fb4965e2 100644 --- a/src/brushes/base_brush.class.js +++ b/src/brushes/base_brush.class.js @@ -43,11 +43,11 @@ fabric.BaseBrush = fabric.util.createClass(/** @lends fabric.BaseBrush.prototype strokeLineJoin: 'round', /** - * Line Dash Array. + * Stroke Dash Array. * @type Array * @default */ - lineDashArray: [0,0], + strokeDashArray: null, /** * Sets shadow of an object @@ -71,7 +71,7 @@ fabric.BaseBrush = fabric.util.createClass(/** @lends fabric.BaseBrush.prototype ctx.lineWidth = this.width; ctx.lineCap = this.strokeLineCap; ctx.lineJoin = this.strokeLineJoin; - ctx.setLineDash(this.lineDashArray); + ctx.setLineDash(this.strokeDashArray); }, /** From 3f9fc4c74546c7952ff7a031b47ff5f96a4a8df6 Mon Sep 17 00:00:00 2001 From: Thomas Kaltz III Date: Thu, 15 Jan 2015 13:37:28 -0800 Subject: [PATCH 3/3] rename to strokeDashArray --- src/brushes/pencil_brush.class.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/brushes/pencil_brush.class.js b/src/brushes/pencil_brush.class.js index d596f95a..3662b84c 100644 --- a/src/brushes/pencil_brush.class.js +++ b/src/brushes/pencil_brush.class.js @@ -171,7 +171,7 @@ strokeWidth: this.width, strokeLineCap: this.strokeLineCap, strokeLineJoin: this.strokeLineJoin, - strokeDashArray: this.lineDashArray, + strokeDashArray: this.strokeDashArray, originX: 'center', originY: 'center' });