Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-07-09 14:35:44 -0700
committer: Valerio Virgillito 2012-07-09 14:35:44 -0700
commit: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree: 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/tools-properties/shape-properties.reel/shape-properties.js
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
1 files changed, 1 insertions, 1 deletions
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 f812f1bf..d10d2870 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -206,7 +206,7 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
                    this._fillColorCtrlContainer.style["display"] = "none";
                    this._fillColorCtrlContainer.visible = false;
                    this._fillColorCtrlIcon.style["display"] = "none";
-                    this._fillColorCtrlIcon.visible = false;                    
+                    this._fillColorCtrlIcon.visible = false;
                    this.endDivider.style["display"] = "none";
                } else {
                    this._fillColorCtrlContainer.style["display"] = "";
author	Valerio Virgillito	2012-07-09 14:35:44 -0700
committer	Valerio Virgillito	2012-07-09 14:35:44 -0700
commit	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree	3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/tools-properties/shape-properties.reel/shape-properties.js
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

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 f812f1bf..d10d2870 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.js +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -206,7 +206,7 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
206	this._fillColorCtrlContainer.style["display"] = "none";	206	this._fillColorCtrlContainer.style["display"] = "none";
207	this._fillColorCtrlContainer.visible = false;	207	this._fillColorCtrlContainer.visible = false;
208	this._fillColorCtrlIcon.style["display"] = "none";	208	this._fillColorCtrlIcon.style["display"] = "none";
209	this._fillColorCtrlIcon.visible = false;	209	this._fillColorCtrlIcon.visible = false;
210	this.endDivider.style["display"] = "none";	210	this.endDivider.style["display"] = "none";
211	} else {	211	} else {
212	this._fillColorCtrlContainer.style["display"] = "";	212	this._fillColorCtrlContainer.style["display"] = "";