diff options
author | Pushkar Joshi | 2012-05-21 08:40:40 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-21 08:40:40 -0700 |
commit | 11cfa9ef2871002b600f1c18f4e06e55a826163c (patch) | |
tree | 381b23b0fa86cdf283a0da7a1b7d532a94e89db4 /js/components/tools-properties/text-properties.reel/text-properties.js | |
parent | 4cb3612c9a67f4020d2949b5e5e5d84a90017974 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-11cfa9ef2871002b600f1c18f4e06e55a826163c.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.js')
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js index 88d38ffe..fa2ec066 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.js +++ b/js/components/tools-properties/text-properties.reel/text-properties.js | |||
@@ -202,7 +202,6 @@ exports.TextProperties = Montage.create(ToolProperties, { | |||
202 | if (!this.initialized) { | 202 | if (!this.initialized) { |
203 | 203 | ||
204 | //Setup Font Selection tool | 204 | //Setup Font Selection tool |
205 | this.fontColor = this.element.getElementsByClassName("fontColor")[0]; | ||
206 | this.fontColor.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80}; | 205 | this.fontColor.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80}; |
207 | this.application.ninja.colorController.addButton("chip", this.fontColor); | 206 | this.application.ninja.colorController.addButton("chip", this.fontColor); |
208 | this.fontColor.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'}); | 207 | this.fontColor.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'}); |