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/ui/color-chip.reel
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
2 files changed, 5 insertions, 5 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html
index 4cc7bb29..fb862a4d 100755
--- a/js/components/ui/color-chip.reel/color-chip.html
+++ b/js/components/ui/color-chip.reel/color-chip.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
    </script>
 </head>
 <body>
-        <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class -->
+    <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class -->
    <div data-montage-id="colorChipContainer" class="colortoolbar">
        <div data-montage-id="chipIcon"></div>
        <div class="chipContainer">
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index 1c1c6054..2353d2a5 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -107,9 +107,9 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
                var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)";
                if(this.color && this.color.color) {
-                        var g =  this.color.color;
+                    var g =  this.color.color;
-                        g.wasSetByCode = true;
+                    g.wasSetByCode = true;
-                        this.chipBtn.color(this.color.mode, g);
+                    this.chipBtn.color(this.color.mode, g);
                } else if (this.color) {
                    var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css);
                    mode = colorObj.mode;
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/ui/color-chip.reel
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html index 4cc7bb29..fb862a4d 100755 --- a/js/components/ui/color-chip.reel/color-chip.html +++ b/js/components/ui/color-chip.reel/color-chip.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE HTML>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All Rights Reserved.
@@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
46	</script>	46	</script>
47	</head>	47	</head>
48	<body>	48	<body>
49	<!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class -->	49	<!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class -->
50	<div data-montage-id="colorChipContainer" class="colortoolbar">	50	<div data-montage-id="colorChipContainer" class="colortoolbar">
51	<div data-montage-id="chipIcon"></div>	51	<div data-montage-id="chipIcon"></div>
52	<div class="chipContainer">	52	<div class="chipContainer">


diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js index 1c1c6054..2353d2a5 100755 --- a/js/components/ui/color-chip.reel/color-chip.js +++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -107,9 +107,9 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
107	var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)";	107	var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)";
108		108
109	if(this.color && this.color.color) {	109	if(this.color && this.color.color) {
110	var g = this.color.color;	110	var g = this.color.color;
111	g.wasSetByCode = true;	111	g.wasSetByCode = true;
112	this.chipBtn.color(this.color.mode, g);	112	this.chipBtn.color(this.color.mode, g);
113	} else if (this.color) {	113	} else if (this.color) {
114	var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css);	114	var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css);
115	mode = colorObj.mode;	115	mode = colorObj.mode;