aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel
diff options
context:
space:
mode:
authorKruti Shah2012-06-22 10:00:53 -0700
committerKruti Shah2012-06-22 10:00:53 -0700
commit4bf8e4cdc179c3b388fc06f26008808aa4b77eb0 (patch)
tree743ea0d3a3af9cae65d5af531a6dba1951b03b33 /js/components/tools-properties/shape-properties.reel
parentcb9fbfeba90b5b76d3f3f2b9303129ca4651e5be (diff)
parent020ad879a627c4234a8732f05e175ad69cedf180 (diff)
downloadninja-4bf8e4cdc179c3b388fc06f26008808aa4b77eb0.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel')
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html5
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js8
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 @@
112 "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"}, 112 "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"},
113 "_fillColorCtrl": {"#": "fillColorCtrl"}, 113 "_fillColorCtrl": {"#": "fillColorCtrl"},
114 "_strokeColorCtrl": {"#": "strokeColorCtrl"}, 114 "_strokeColorCtrl": {"#": "strokeColorCtrl"},
115 "_fillColorCtrlContainer": {"#": "fillColorCtrlContainer"},
115 116
116 "_strokeSize": {"@": "_strokeSize1"}, 117 "_strokeSize": {"@": "_strokeSize1"},
117 "ovalProperties": {"@": "ovalProperties1"}, 118 "ovalProperties": {"@": "ovalProperties1"},
@@ -135,9 +136,9 @@
135 </div> 136 </div>
136 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 137 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
137 <div class="toolColorChipIcon PencilTool"></div> 138 <div class="toolColorChipIcon PencilTool"></div>
138 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 139 <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
139 <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div> 140 <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div>
140 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 141 <div data-montage-id="fillColorCtrlContainer" class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
141 <div class="nj-divider divider-vertical">&nbsp;</div> 142 <div class="nj-divider divider-vertical">&nbsp;</div>
142 <label class="label">Stroke:</label> 143 <label class="label">Stroke:</label>
143 <div data-montage-id="strokeControl" class="label"></div> 144 <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, {
179 this[this._selectedSubTool.properties].visible = true; 179 this[this._selectedSubTool.properties].visible = true;
180 180
181 if (this._selectedSubTool.id === "LineTool") { 181 if (this._selectedSubTool.id === "LineTool") {
182 this._fillColorCtrl.style["display"] = "none"; 182 this._fillColorCtrlContainer.style["display"] = "none";
183 this._fillColorCtrl.visible = false; 183 this._fillColorCtrlContainer.visible = false;
184 this._fillColorCtrlIcon.style["display"] = "none"; 184 this._fillColorCtrlIcon.style["display"] = "none";
185 this._fillColorCtrlIcon.visible = false; 185 this._fillColorCtrlIcon.visible = false;
186 this.endDivider.style["display"] = "none"; 186 this.endDivider.style["display"] = "none";
187 } else { 187 } else {
188 this._fillColorCtrl.style["display"] = ""; 188 this._fillColorCtrlContainer.style["display"] = "";
189 this._fillColorCtrl.visible = true; 189 this._fillColorCtrlContainer.visible = true;
190 this._fillColorCtrlIcon.style["display"] = ""; 190 this._fillColorCtrlIcon.style["display"] = "";
191 this._fillColorCtrlIcon.visible = true; 191 this._fillColorCtrlIcon.visible = true;
192 this.endDivider.style["display"] = ""; 192 this.endDivider.style["display"] = "";