diff options
Diffstat (limited to 'js/components/tools-properties/text-properties.reel')
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 4 | ||||
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.js | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index 03786d76..23de2bca 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -21,7 +21,7 @@ | |||
21 | "fontSelection": {"@": "fontSelection"}, | 21 | "fontSelection": {"@": "fontSelection"}, |
22 | "fontSettings": {"@": "fontSettings"}, | 22 | "fontSettings": {"@": "fontSettings"}, |
23 | "fontSize": {"@": "fontSize"}, | 23 | "fontSize": {"@": "fontSize"}, |
24 | "fontColor": {"@": "fontColor"}, | 24 | "fontColor": {"#": "fontColorCtrl"}, |
25 | "btnBold": {"@": "btnBold"}, | 25 | "btnBold": {"@": "btnBold"}, |
26 | "btnItalic": {"@": "btnItalic"}, | 26 | "btnItalic": {"@": "btnItalic"}, |
27 | "btnUnderline": {"@": "btnUnderline"}, | 27 | "btnUnderline": {"@": "btnUnderline"}, |
@@ -306,7 +306,7 @@ | |||
306 | <button id="fontSettings" style="display: none"></button> | 306 | <button id="fontSettings" style="display: none"></button> |
307 | <label class="label">Size:</label> | 307 | <label class="label">Size:</label> |
308 | <select id="fontSize" class="nj-skinned"></select> | 308 | <select id="fontSize" class="nj-skinned"></select> |
309 | <div class="fontColor"></div> | 309 | <div data-montage-id="fontColorCtrl" class="fontColor"></div> |
310 | <div class="btnGroup"> | 310 | <div class="btnGroup"> |
311 | <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button> | 311 | <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button> |
312 | <button id="btnItalic" class="btnItalic nj-skinned" style="font-style: italic;"></button> | 312 | <button id="btnItalic" class="btnItalic nj-skinned" style="font-style: italic;"></button> |
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)'}); |