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/panels/Timeline/Track.reel/Track.html
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
1 files changed, 21 insertions, 21 deletions
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html
index 6be86ef6..6c977f1a 100644
--- a/js/panels/Timeline/Track.reel/Track.html
+++ b/js/panels/Timeline/Track.reel/Track.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -29,10 +29,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <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" type="text/css" href="css/Track.css">
+        <link rel="stylesheet" type="text/css" href="css/Track.css">
-                <script type="text/montage-serialization">
+        <script type="text/montage-serialization">
            {
                "owner": {
                    "prototype": "js/panels/Timeline/Track.reel",
@@ -58,30 +58,30 @@ POSSIBILITY OF SUCH DAMAGE.
                },
                "spanRepetition": {
-                        "prototype": "montage/ui/repetition.reel",
+                    "prototype": "montage/ui/repetition.reel",
-                        "properties": {
+                    "properties": {
-                            "element": {"#": "track_lanes"},
+                        "element": {"#": "track_lanes"},
-                                "isSelectionEnabled" : true
+                            "isSelectionEnabled" : true
-                        },
+                    },
-                        "bindings": {
+                    "bindings": {
-                            "objects": {
+                        "objects": {
-                                "boundObject": {"@": "owner"},
+                            "boundObject": {"@": "owner"},
-                                "boundObjectPropertyPath": "spans",
+                            "boundObjectPropertyPath": "spans",
-                                "oneway": false
+                            "oneway": false
-                            }
+                        }
-                        }
+                    }
                }
            }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-        <div data-montage-id="track">
+        <div data-montage-id="track">
            <div data-montage-id="track_lanes">
                <div data-montage-id="track_lane" class="tracklane"></div>
            </div>
-        </div>
+        </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/panels/Timeline/Track.reel/Track.html
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html index 6be86ef6..6c977f1a 100644 --- a/js/panels/Timeline/Track.reel/Track.html +++ b/js/panels/Timeline/Track.reel/Track.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.
@@ -29,10 +29,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	29	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" type="text/css" href="css/Track.css">	34	<link rel="stylesheet" type="text/css" href="css/Track.css">
35	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
36	{	36	{
37	"owner": {	37	"owner": {
38	"prototype": "js/panels/Timeline/Track.reel",	38	"prototype": "js/panels/Timeline/Track.reel",
@@ -58,30 +58,30 @@ POSSIBILITY OF SUCH DAMAGE.
58	},	58	},
59		59
60	"spanRepetition": {	60	"spanRepetition": {
61	"prototype": "montage/ui/repetition.reel",	61	"prototype": "montage/ui/repetition.reel",
62	"properties": {	62	"properties": {
63	"element": {"#": "track_lanes"},	63	"element": {"#": "track_lanes"},
64	"isSelectionEnabled" : true	64	"isSelectionEnabled" : true
65	},	65	},
66	"bindings": {	66	"bindings": {
67	"objects": {	67	"objects": {
68	"boundObject": {"@": "owner"},	68	"boundObject": {"@": "owner"},
69	"boundObjectPropertyPath": "spans",	69	"boundObjectPropertyPath": "spans",
70	"oneway": false	70	"oneway": false
71	}	71	}
72	}	72	}
73	}	73	}
74		74
75	}	75	}
76	</script>	76	</script>
77	</head>	77	</head>
78	<body>	78	<body>
79		79
80	<div data-montage-id="track">	80	<div data-montage-id="track">
81	<div data-montage-id="track_lanes">	81	<div data-montage-id="track_lanes">
82	<div data-montage-id="track_lane" class="tracklane"></div>	82	<div data-montage-id="track_lane" class="tracklane"></div>
83	</div>	83	</div>
84	</div>	84	</div>
85		85
86	</body>	86	</body>
87	</html>	87	</html>