From 4b186e0c3f97f704d1ac671a63cd02084e19fe0e Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 21 Jun 2012 12:51:14 -0700 Subject: Fixing reference issue for toolbar fill container The wrapper container was not being referenced, caused some toggling visibility issues. --- .../tools-properties/shape-properties.reel/shape-properties.html | 3 ++- .../tools-properties/shape-properties.reel/shape-properties.js | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'js/components') 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 22ea7431..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"}, @@ -137,7 +138,7 @@
-
+
 
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"] = ""; -- cgit v1.2.3