aboutsummaryrefslogtreecommitdiff
path: root/js/tools/OvalTool.js
diff options
context:
space:
mode:
authorhwc4872012-02-03 15:24:23 -0800
committerhwc4872012-02-03 15:24:23 -0800
commitb8092d97bf4488cc733bd39365a7a0b0e0f554b2 (patch)
treeaf36c056294e4b7ad5d67d8f4914b08c78d48fac /js/tools/OvalTool.js
parent3d5b5f7c5efb25b5e605d5d120b57f2dde33fd23 (diff)
parent4b8eb7442b41db7e06b639ba4a31bb7664209159 (diff)
downloadninja-b8092d97bf4488cc733bd39365a7a0b0e0f554b2.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Diffstat (limited to 'js/tools/OvalTool.js')
-rw-r--r--js/tools/OvalTool.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e0f1f03f..2fa5411b 100644
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -75,6 +75,14 @@ exports.OvalTool = Montage.create(ShapeTool, {
75 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; 75 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
76 canvas.elementModel.shapeModel.stroke = strokeColor; 76 canvas.elementModel.shapeModel.stroke = strokeColor;
77 canvas.elementModel.shapeModel.fill = fillColor; 77 canvas.elementModel.shapeModel.fill = fillColor;
78 if(strokeColor)
79 {
80 canvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
81 }
82 if(fillColor)
83 {
84 canvas.elementModel.shapeModel.background = this.application.ninja.colorController.colorToolbar.fill;
85 }
78 86
79 canvas.elementModel.shapeModel.innerRadius = this.options.innerRadius.value + " " + this.options.innerRadius.units; 87 canvas.elementModel.shapeModel.innerRadius = this.options.innerRadius.value + " " + this.options.innerRadius.units;
80 88