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/treeview/treeview.reel/treeview.html
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
1 files changed, 6 insertions, 6 deletions
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index d1621d50..ef0d6a24 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
 <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
        <link rel="stylesheet" href="treeview.css" type="text/css">
        <script type="text/montage-serialization">
        {
@@ -45,10 +45,10 @@ POSSIBILITY OF SUCH DAMAGE.
                }
            },
            "defaultBranch" : {
-                "prototype" : "js/components/treeview/branch.reel"                
+                "prototype" : "js/components/treeview/branch.reel"
            },
            "defaultLeaf" : {
-                "prototype" : "js/components/treeview/leaf.reel"                
+                "prototype" : "js/components/treeview/leaf.reel"
            },
            "scrollview": {
                "prototype": "montage/ui/scroller.reel",
@@ -63,8 +63,8 @@ POSSIBILITY OF SUCH DAMAGE.
                    "element": {"#": "rootBranch"}
                }
            }
-        }
+        }
-                </script>
+        </script>
 </head>
 <body>
    <div data-montage-id="treeView" class="treeView">
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/treeview/treeview.reel/treeview.html
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html index d1621d50..ef0d6a24 100644 --- a/js/components/treeview/treeview.reel/treeview.html +++ b/js/components/treeview/treeview.reel/treeview.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.
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31	<html lang="en">	31	<html lang="en">
32	<head>	32	<head>
33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" href="treeview.css" type="text/css">	34	<link rel="stylesheet" href="treeview.css" type="text/css">
35	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
36	{	36	{
@@ -45,10 +45,10 @@ POSSIBILITY OF SUCH DAMAGE.
45	}	45	}
46	},	46	},
47	"defaultBranch" : {	47	"defaultBranch" : {
48	"prototype" : "js/components/treeview/branch.reel"	48	"prototype" : "js/components/treeview/branch.reel"
49	},	49	},
50	"defaultLeaf" : {	50	"defaultLeaf" : {
51	"prototype" : "js/components/treeview/leaf.reel"	51	"prototype" : "js/components/treeview/leaf.reel"
52	},	52	},
53	"scrollview": {	53	"scrollview": {
54	"prototype": "montage/ui/scroller.reel",	54	"prototype": "montage/ui/scroller.reel",
@@ -63,8 +63,8 @@ POSSIBILITY OF SUCH DAMAGE.
63	"element": {"#": "rootBranch"}	63	"element": {"#": "rootBranch"}
64	}	64	}
65	}	65	}
66	}	66	}
67	</script>	67	</script>
68	</head>	68	</head>
69	<body>	69	<body>
70	<div data-montage-id="treeView" class="treeView">	70	<div data-montage-id="treeView" class="treeView">