Merge branch 'refs/heads/Ninja-Internal' into FileIO

2 files changed, 7 insertions, 6 deletions

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index ea246ea8..5f93b556 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -112,6 +112,7 @@
                     "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"},
                     "_fillColorCtrl": {"#": "fillColorCtrl"},
                     "_strokeColorCtrl": {"#": "strokeColorCtrl"},
+                    "_fillColorCtrlContainer": {"#": "fillColorCtrlContainer"},
 
                     "_strokeSize": {"@": "_strokeSize1"},
                     "ovalProperties": {"@": "ovalProperties1"},
@@ -135,9 +136,9 @@
             </div>
             <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
             <div class="toolColorChipIcon PencilTool"></div>
-            <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
             <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+            <div data-montage-id="fillColorCtrlContainer" class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
             <div class="nj-divider divider-vertical">&nbsp;</div>
             <label class="label">Stroke:</label>
             <div data-montage-id="strokeControl" class="label"></div>
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 5829634c..7306275a 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -179,14 +179,14 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
                 this[this._selectedSubTool.properties].visible = true;
 
                 if (this._selectedSubTool.id === "LineTool") {
-                    this._fillColorCtrl.style["display"] = "none";
-                    this._fillColorCtrl.visible = false;
+                    this._fillColorCtrlContainer.style["display"] = "none";
+                    this._fillColorCtrlContainer.visible = false;
                     this._fillColorCtrlIcon.style["display"] = "none";
                     this._fillColorCtrlIcon.visible = false;                    
                     this.endDivider.style["display"] = "none";
                 } else {
-                    this._fillColorCtrl.style["display"] = "";
-                    this._fillColorCtrl.visible = true;
+                    this._fillColorCtrlContainer.style["display"] = "";
+                    this._fillColorCtrlContainer.visible = true;
                     this._fillColorCtrlIcon.style["display"] = "";
                     this._fillColorCtrlIcon.visible = true;
                     this.endDivider.style["display"] = "";