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/colorwheel.reel/colorwheel.html
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
1 files changed, 34 insertions, 34 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html
index b39479a8..2de64d7e 100755
--- a/js/components/colorwheel.reel/colorwheel.html
+++ b/js/components/colorwheel.reel/colorwheel.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
+<!doctype html>
-<!-- 
+<!--
 <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -31,39 +31,39 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright>
 -->
 <html lang="en">
-        <head>
+    <head>
-        
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        
-        <link rel="stylesheet" type="text/css" href="css/colorwheel.css">
-                <script type="text/montage-serialization">
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-                        {
-                "owner": {
-                        "prototype": "js/components/colorwheel.reel[ColorWheel]",
-                        "properties": {
-                        "element": {"#": "colorwheel"},
-                        "wheel": {"#": "wheel"},
-                        "wheelSelect": {"#": "wselect"},
-                        "swatch": {"#": "swatch"},
-                        "swatchSelect": {"#": "sselect"}
-                        }
+        <link rel="stylesheet" type="text/css" href="css/colorwheel.css">
-                }
-                }
+        <script type="text/montage-serialization">
-                </script>
+            {
-                
+                "owner": {
-        </head>
+                    "prototype": "js/components/colorwheel.reel[ColorWheel]",
-        
+                    "properties": {
-        <body>
+                        "element": {"#": "colorwheel"},
-    
+                        "wheel": {"#": "wheel"},
-        <div data-montage-id="colorwheel" class="colorwheel">
+                        "wheelSelect": {"#": "wselect"},
-                <canvas data-montage-id="wheel"></canvas>
+                        "swatch": {"#": "swatch"},
-                <canvas data-montage-id="swatch"></canvas>
+                        "swatchSelect": {"#": "sselect"}
-                <canvas data-montage-id="sselect"></canvas>
-                <canvas data-montage-id="wselect"></canvas>
+                    }
-        </div>
+                }
-    
+            }
-        </body>
+        </script>
+    </head>
+    <body>
+        <div data-montage-id="colorwheel" class="colorwheel">
+            <canvas data-montage-id="wheel"></canvas>
+            <canvas data-montage-id="swatch"></canvas>
+            <canvas data-montage-id="sselect"></canvas>
+            <canvas data-montage-id="wselect"></canvas>
+        </div>
+    </body>
 </html>
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/colorwheel.reel/colorwheel.html
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index b39479a8..2de64d7e 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html
@@ -1,5 +1,5 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!--	2	<!--
3	<copyright>	3	<copyright>
4	Copyright (c) 2012, Motorola Mobility, Inc	4	Copyright (c) 2012, Motorola Mobility, Inc
5	All Rights Reserved.	5	All Rights Reserved.
@@ -31,39 +31,39 @@ POSSIBILITY OF SUCH DAMAGE.
31	</copyright>	31	</copyright>
32	-->	32	-->
33	<html lang="en">	33	<html lang="en">
34	<head>	34	<head>
35
36	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
37
38	<link rel="stylesheet" type="text/css" href="css/colorwheel.css">
39		35
40	<script type="text/montage-serialization">	36	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
41	{
42	"owner": {
43	"prototype": "js/components/colorwheel.reel[ColorWheel]",
44	"properties": {
45	"element": {"#": "colorwheel"},
46	"wheel": {"#": "wheel"},
47	"wheelSelect": {"#": "wselect"},
48	"swatch": {"#": "swatch"},
49	"swatchSelect": {"#": "sselect"}
50		37
51	}	38	<link rel="stylesheet" type="text/css" href="css/colorwheel.css">
52	}	39
53	}	40	<script type="text/montage-serialization">
54	</script>	41	{
55		42	"owner": {
56	</head>	43	"prototype": "js/components/colorwheel.reel[ColorWheel]",
57		44	"properties": {
58	<body>	45	"element": {"#": "colorwheel"},
59		46	"wheel": {"#": "wheel"},
60	<div data-montage-id="colorwheel" class="colorwheel">	47	"wheelSelect": {"#": "wselect"},
61	<canvas data-montage-id="wheel"></canvas>	48	"swatch": {"#": "swatch"},
62	<canvas data-montage-id="swatch"></canvas>	49	"swatchSelect": {"#": "sselect"}
63	<canvas data-montage-id="sselect"></canvas>	50
64	<canvas data-montage-id="wselect"></canvas>	51	}
65	</div>	52	}
66		53	}
67	</body>	54	</script>
		55
		56	</head>
		57
		58	<body>
		59
		60	<div data-montage-id="colorwheel" class="colorwheel">
		61	<canvas data-montage-id="wheel"></canvas>
		62	<canvas data-montage-id="swatch"></canvas>
		63	<canvas data-montage-id="sselect"></canvas>
		64	<canvas data-montage-id="wselect"></canvas>
		65	</div>
		66
		67	</body>
68		68
69	</html>	69	</html>