diff options
author | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
commit | 5496f0060c5f43e7951a110241a18b9e631761bb (patch) | |
tree | bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/components/tools-properties/shape-properties.reel/shape-properties.js | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff) | |
download | ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.js')
-rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.js | 4 |
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); |