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/Style.reel/Style.html
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
1 files changed, 69 insertions, 69 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 271748ab..f9a49727 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.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/Style.css">
+        <link rel="stylesheet" type="text/css" href="css/Style.css">
-                <script type="text/montage-serialization">
+        <script type="text/montage-serialization">
            {
                "owner": {
                    "prototype": "js/panels/Timeline/Style.reel",
@@ -47,73 +47,73 @@ POSSIBILITY OF SUCH DAMAGE.
                        "_fillColorCtrl": {"#": "fillColorCtrl"}
                    }
                },
-                    "dtext1" : {
+                "dtext1" : {
-                        "prototype" : "montage/ui/dynamic-text.reel",
+                    "prototype" : "montage/ui/dynamic-text.reel",
-                        "properties" : {
+                    "properties" : {
-                                "element" : {"#" : "container-property"}
+                        "element" : {"#" : "container-property"}
-                        },
+                    },
-                        "bindings" : {
+                    "bindings" : {
-                                "value" : {
+                        "value" : {
-                                        "boundObject" : {"@" : "owner"},
+                            "boundObject" : {"@" : "owner"},
-                                        "boundObjectPropertyPath" : "editorProperty",
+                            "boundObjectPropertyPath" : "editorProperty",
-                                        "oneway" : false
+                            "oneway" : false
-                                }
+                        }
-                        }
+                    }
-                    },
+                },
-                    "hottextunit" : {
+                "hottextunit" : {
-                        "prototype" : "js/components/hottextunit.reel[HotTextUnit]",
+                    "prototype" : "js/components/hottextunit.reel[HotTextUnit]",
-                        "properties" : {
+                    "properties" : {
-                                "element" : {"#":"value-editor-hottext"}
+                        "element" : {"#":"value-editor-hottext"}
-                        },
+                    },
-                        "bindings" : {
+                    "bindings" : {
-                                "value" : {
+                        "value" : {
-                                        "boundObject" : {"@" : "owner"},
+                            "boundObject" : {"@" : "owner"},
-                                        "boundObjectPropertyPath" : "editorValue",
+                            "boundObjectPropertyPath" : "editorValue",
-                                        "oneway" : false
+                            "oneway" : false
-                                }
+                        }
-                        }
+                    }
-                    },
+                },
-                    "hintable" : {
+                "hintable" : {
-                        "prototype" : "js/components/hintable.reel",
+                    "prototype" : "js/components/hintable.reel",
-                        "properties" : {
+                    "properties" : {
-                                "element" : {"#":"style-hintable"}
+                        "element" : {"#":"style-hintable"}
-                        },
+                    },
-                        "bindings" : {
+                    "bindings" : {
-                                "value" : {
+                        "value" : {
-                                        "boundObject" : {"@" : "owner"},
+                            "boundObject" : {"@" : "owner"},
-                                        "boundObjectPropertyPath" : "editorProperty",
+                            "boundObjectPropertyPath" : "editorProperty",
-                                        "oneway" : true
+                            "oneway" : true
-                                }
+                        }
-                        }
+                    }
-                    }
+                }
            }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-                <div data-montage-id="style-container">
+        <div data-montage-id="style-container">
-                        <div class="style-padding">
+            <div class="style-padding">
-                                <div class="row-hintable hidden">
+                <div class="row-hintable hidden">
-                                        <div data-montage-id="style-hintable"></div>
+                    <div data-montage-id="style-hintable"></div>
-                                </div>
+                </div>
-                                <div class="container-propvals hidden">
+                <div class="container-propvals hidden">
-                                        <div class="cell-property">
+                    <div class="cell-property">
-                                                <div data-montage-id="container-property">property</div>
+                        <div data-montage-id="container-property">property</div>
-                                        </div>
+                    </div>
-                                        <div class="cell-value value-editor editor-hottext hidden">
+                    <div class="cell-value value-editor editor-hottext hidden">
-                                                <div data-montage-id="value-editor-hottext"></div>
+                        <div data-montage-id="value-editor-hottext"></div>
-                                        </div>
+                    </div>
-                                        <div class="cell-value value-editor editor-color hidden">
+                    <div class="cell-value value-editor editor-color hidden">
-                                                <div data-montage-id="value-editor-color">
+                        <div data-montage-id="value-editor-color">
                            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl color-chip-position"></div>
-                                                </div>
+                        </div>
-                                        </div>
+                    </div>
-                                        <div class="cell-value value-editor editor-input hidden">
+                    <div class="cell-value value-editor editor-input hidden">
-                                                <!-- <div data-montage-id="value-editor-input"></div> -->
+                        <!-- <div data-montage-id="value-editor-input"></div> -->
-                                                <input type="text" class="nj-skinned" value="" />
+                        <input type="text" class="nj-skinned" value="" />
-                                        </div>
+                    </div>
-                                </div>
+                </div>
-                        </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/Style.reel/Style.html
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index 271748ab..f9a49727 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.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/Style.css">	34	<link rel="stylesheet" type="text/css" href="css/Style.css">
35	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
36	{	36	{
37	"owner": {	37	"owner": {
38	"prototype": "js/panels/Timeline/Style.reel",	38	"prototype": "js/panels/Timeline/Style.reel",
@@ -47,73 +47,73 @@ POSSIBILITY OF SUCH DAMAGE.
47	"_fillColorCtrl": {"#": "fillColorCtrl"}	47	"_fillColorCtrl": {"#": "fillColorCtrl"}
48	}	48	}
49	},	49	},
50	"dtext1" : {	50	"dtext1" : {
51	"prototype" : "montage/ui/dynamic-text.reel",	51	"prototype" : "montage/ui/dynamic-text.reel",
52	"properties" : {	52	"properties" : {
53	"element" : {"#" : "container-property"}	53	"element" : {"#" : "container-property"}
54	},	54	},
55	"bindings" : {	55	"bindings" : {
56	"value" : {	56	"value" : {
57	"boundObject" : {"@" : "owner"},	57	"boundObject" : {"@" : "owner"},
58	"boundObjectPropertyPath" : "editorProperty",	58	"boundObjectPropertyPath" : "editorProperty",
59	"oneway" : false	59	"oneway" : false
60	}	60	}
61	}	61	}
62	},	62	},
63	"hottextunit" : {	63	"hottextunit" : {
64	"prototype" : "js/components/hottextunit.reel[HotTextUnit]",	64	"prototype" : "js/components/hottextunit.reel[HotTextUnit]",
65	"properties" : {	65	"properties" : {
66	"element" : {"#":"value-editor-hottext"}	66	"element" : {"#":"value-editor-hottext"}
67	},	67	},
68	"bindings" : {	68	"bindings" : {
69	"value" : {	69	"value" : {
70	"boundObject" : {"@" : "owner"},	70	"boundObject" : {"@" : "owner"},
71	"boundObjectPropertyPath" : "editorValue",	71	"boundObjectPropertyPath" : "editorValue",
72	"oneway" : false	72	"oneway" : false
73	}	73	}
74	}	74	}
75	},	75	},
76	"hintable" : {	76	"hintable" : {
77	"prototype" : "js/components/hintable.reel",	77	"prototype" : "js/components/hintable.reel",
78	"properties" : {	78	"properties" : {
79	"element" : {"#":"style-hintable"}	79	"element" : {"#":"style-hintable"}
80	},	80	},
81	"bindings" : {	81	"bindings" : {
82	"value" : {	82	"value" : {
83	"boundObject" : {"@" : "owner"},	83	"boundObject" : {"@" : "owner"},
84	"boundObjectPropertyPath" : "editorProperty",	84	"boundObjectPropertyPath" : "editorProperty",
85	"oneway" : true	85	"oneway" : true
86	}	86	}
87	}	87	}
88	}	88	}
89	}	89	}
90	</script>	90	</script>
91	</head>	91	</head>
92	<body>	92	<body>
93	<div data-montage-id="style-container">	93	<div data-montage-id="style-container">
94	<div class="style-padding">	94	<div class="style-padding">
95	<div class="row-hintable hidden">	95	<div class="row-hintable hidden">
96	<div data-montage-id="style-hintable"></div>	96	<div data-montage-id="style-hintable"></div>
97	</div>	97	</div>
98	<div class="container-propvals hidden">	98	<div class="container-propvals hidden">
99	<div class="cell-property">	99	<div class="cell-property">
100	<div data-montage-id="container-property">property</div>	100	<div data-montage-id="container-property">property</div>
101	</div>	101	</div>
102	<div class="cell-value value-editor editor-hottext hidden">	102	<div class="cell-value value-editor editor-hottext hidden">
103	<div data-montage-id="value-editor-hottext"></div>	103	<div data-montage-id="value-editor-hottext"></div>
104	</div>	104	</div>
105	<div class="cell-value value-editor editor-color hidden">	105	<div class="cell-value value-editor editor-color hidden">
106	<div data-montage-id="value-editor-color">	106	<div data-montage-id="value-editor-color">
107	<div data-montage-id="fillColorCtrl" class="toolColorChipCtrl color-chip-position"></div>	107	<div data-montage-id="fillColorCtrl" class="toolColorChipCtrl color-chip-position"></div>
108	</div>	108	</div>
109	</div>	109	</div>
110	<div class="cell-value value-editor editor-input hidden">	110	<div class="cell-value value-editor editor-input hidden">
111	<!-- <div data-montage-id="value-editor-input"></div> -->	111	<!-- <div data-montage-id="value-editor-input"></div> -->
112	<input type="text" class="nj-skinned" value="" />	112	<input type="text" class="nj-skinned" value="" />
113	</div>	113	</div>
114	</div>	114	</div>
115		115
116	</div>	116	</div>
117	</div>	117	</div>
118	</body>	118	</body>
119	</html>	119	</html>