aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel/shape-properties.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-28 14:31:07 -0700
committerJose Antonio Marquez2012-06-28 14:31:07 -0700
commitd9f048d5c11a40e6ee0390369fb39d73fc3f5bcc (patch)
tree82984e11a4103265674bb27161a3f76023f9caae /js/components/tools-properties/shape-properties.reel/shape-properties.js
parentee1adbcc33932bc27966c02b159a3ab06966d4a5 (diff)
parent3ba9accb8e1887bfd6f1f912b6135073a3d9c70c (diff)
downloadninja-d9f048d5c11a40e6ee0390369fb39d73fc3f5bcc.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.js')
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 7306275a..e6b71f95 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -125,11 +125,11 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
125 125
126 if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { 126 if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) {
127 // setup fill color 127 // setup fill color
128 this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; 128 this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80 };
129 this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); 129 this.application.ninja.colorController.addButton("chip", this._fillColorCtrl);
130 130
131 // setup stroke color 131 // setup stroke color
132 this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; 132 this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80 };
133 this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); 133 this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl);
134 134
135 this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); 135 this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false);