diff options
author | Jose Antonio Marquez | 2012-06-28 14:31:07 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-28 14:31:07 -0700 |
commit | d9f048d5c11a40e6ee0390369fb39d73fc3f5bcc (patch) | |
tree | 82984e11a4103265674bb27161a3f76023f9caae /js/components/tools-properties/tag-properties.reel/tag-properties.js | |
parent | ee1adbcc33932bc27966c02b159a3ab06966d4a5 (diff) | |
parent | 3ba9accb8e1887bfd6f1f912b6135073a3d9c70c (diff) | |
download | ninja-d9f048d5c11a40e6ee0390369fb39d73fc3f5bcc.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel/tag-properties.js')
-rwxr-xr-x | js/components/tools-properties/tag-properties.reel/tag-properties.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.js b/js/components/tools-properties/tag-properties.reel/tag-properties.js index d38419aa..ab745049 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.js +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.js | |||
@@ -65,7 +65,7 @@ var TagProperties = exports.TagProperties = Montage.create(ToolProperties, { | |||
65 | Object.getPrototypeOf(TagProperties).draw.call(this); | 65 | Object.getPrototypeOf(TagProperties).draw.call(this); |
66 | 66 | ||
67 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 67 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
68 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 68 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80 }; |
69 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); | 69 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); |
70 | 70 | ||
71 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); | 71 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); |