From 1a759361b82127f9d5c1428dc889fffdf2daaf86 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Thu, 3 May 2012 15:11:56 -0700
Subject: First round of moving color chips into the sub tools. Shape and Pen
 tool now have chips in the sub tool bar. Still need to complete adding chips
 to the Brush tool and finalizing the subtool bar layout to our spec for all
 of the subtools.

---
 .../tools-properties/text-properties.reel/text-properties.html        | 4 ++--
 .../tools-properties/text-properties.reel/text-properties.js          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'js/components/tools-properties/text-properties.reel')

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 @@
                     "fontSelection": {"@": "fontSelection"},
                     "fontSettings": {"@": "fontSettings"},
                     "fontSize": {"@": "fontSize"},
-                    "fontColor": {"@": "fontColor"},
+                    "fontColor": {"#": "fontColorCtrl"},
                     "btnBold": {"@": "btnBold"},
                     "btnItalic": {"@": "btnItalic"},
                     "btnUnderline": {"@": "btnUnderline"},
@@ -306,7 +306,7 @@
             <button id="fontSettings" style="display: none"></button>
             <label class="label">Size:</label>
             <select id="fontSize" class="nj-skinned"></select>
-            <div class="fontColor"></div>
+            <div data-montage-id="fontColorCtrl" class="fontColor"></div>
             <div class="btnGroup">
                 <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button>
                 <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, {
             if (!this.initialized) {
 
                 //Setup Font Selection tool
-                this.fontColor = this.element.getElementsByClassName("fontColor")[0];
                 this.fontColor.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80};
                 this.application.ninja.colorController.addButton("chip", this.fontColor);
                 this.fontColor.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'});
-- 
cgit v1.2.3