diff options
author | Ananya Sen | 2012-06-28 15:19:28 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-28 15:19:28 -0700 |
commit | 624acffc0619d879deaa6dcd8ce3c0cfeaf2227a (patch) | |
tree | ca53a666a93f9bed8912a5c3211ba84fc603c58f /js/components/tools-properties/pen-properties.reel | |
parent | e4d3e040e521648ec9a6d0e0db2e62754f2d8882 (diff) | |
parent | 3ba9accb8e1887bfd6f1f912b6135073a3d9c70c (diff) | |
download | ninja-624acffc0619d879deaa6dcd8ce3c0cfeaf2227a.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel')
-rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index 78065b99..4f7e3474 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js | |||
@@ -111,11 +111,11 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { | |||
111 | 111 | ||
112 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 112 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
113 | // setup fill color | 113 | // setup fill color |
114 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 114 | this._fillColorCtrl.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80}; |
115 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); | 115 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); |
116 | 116 | ||
117 | // setup stroke color | 117 | // setup stroke color |
118 | this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 118 | this._strokeColorCtrl.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80}; |
119 | this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); | 119 | this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); |
120 | 120 | ||
121 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); | 121 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); |