diff options
author | Jon Reid | 2012-03-01 09:23:46 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-01 09:23:46 -0800 |
commit | e67000c704e284f4ab9b50c845853988272ce800 (patch) | |
tree | fad04a6a5ef5bfc8fa4efe88dac3eb7329bc3596 /js/tools/LineTool.js | |
parent | 939cb7eccb8a5ec655fbde8b470894d293832307 (diff) | |
parent | 82ed48cc48ae1f8163021a0998e00d87da396d65 (diff) | |
download | ninja-e67000c704e284f4ab9b50c845853988272ce800.tar.gz |
Merge branch 'Timeline-main' into Timeline-newdoc
Diffstat (limited to 'js/tools/LineTool.js')
-rwxr-xr-x | js/tools/LineTool.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 233316a5..0a7c0534 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -42,7 +42,10 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
42 | } | 42 | } |
43 | 43 | ||
44 | this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null); | 44 | this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null); |
45 | this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css; | 45 | if (this.application.ninja.colorController.colorToolbar.stroke.color) |
46 | this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css; | ||
47 | else | ||
48 | this._strokeColor = [0,0,0,1]; | ||
46 | this.startDraw(event); | 49 | this.startDraw(event); |
47 | } | 50 | } |
48 | }, | 51 | }, |