aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel
diff options
context:
space:
mode:
authorhwc4872012-06-29 13:01:02 -0700
committerhwc4872012-06-29 13:01:02 -0700
commit44eba9c1f7935ae13e87a6dcf6ddea0efa63eb05 (patch)
tree77ec7650cbc397c1792254529b0430cd691fad08 /js/components/tools-properties/shape-properties.reel
parent230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (diff)
parentecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff)
downloadninja-44eba9c1f7935ae13e87a6dcf6ddea0efa63eb05.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel')
-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);