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/Layer.reel
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
3 files changed, 988 insertions, 988 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 3c471952..cfba0e7e 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -29,24 +29,24 @@ 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/Layer.css">
+        <link rel="stylesheet" type="text/css" href="css/Layer.css">
-                <script type="text/montage-serialization">
+        <script type="text/montage-serialization">
            {
                "owner": {
                    "prototype": "js/panels/Timeline/Layer.reel",
                    "properties": {
                        "element": {"#": "layer"},
-                                                "styleRepetition" : {"@":"repetition1"},
+                        "styleRepetition" : {"@":"repetition1"},
-                                                "dynamicLayerName" : {"@":"dtext1"},
+                        "dynamicLayerName" : {"@":"dtext1"},
-                                                "dynamicLayerTag" : {"@": "dtext2"},
+                        "dynamicLayerTag" : {"@": "dtext2"},
-                                                "layer_label_text" : {"#": "layer-label-text"},
+                        "layer_label_text" : {"#": "layer-label-text"},
-                                                "mainCollapser" : {"@" : "mainCollapser"},
+                        "mainCollapser" : {"@" : "mainCollapser"},
-                                                "positionCollapser" : {"@" : "positionCollapser"},
+                        "positionCollapser" : {"@" : "positionCollapser"},
-                                                "styleCollapser" : {"@" : "styleCollapser"},
+                        "styleCollapser" : {"@" : "styleCollapser"},
-                                                "clickerMain" : {"#" : "clicker-main"},
+                        "clickerMain" : {"#" : "clicker-main"},
-                                                "myLabel" : {"#" : "myLabel"},
+                        "myLabel" : {"#" : "myLabel"},
                        "leftControl": {"@" : "dtext_position_x"},
                        "topControl": {"@" : "dtext_position_y"},
                        "widthControl": {"@" : "dtext_scale_x"},
@@ -56,256 +56,256 @@ POSSIBILITY OF SUCH DAMAGE.
                        "visibilityButton":{"#" : "visibilityButton"}
                    }
                },
-                    "dtext1" : {
+                "dtext1" : {
-                        "prototype" : "montage/ui/dynamic-text.reel",
+                    "prototype" : "montage/ui/dynamic-text.reel",
-                        "properties" : {
+                    "properties" : {
-                                "element" : {"#" : "layer-label-text"}
+                        "element" : {"#" : "layer-label-text"}
-                        },
+                    },
-                        "bindings" : {
+                    "bindings" : {
-                                "value" : {
+                        "value" : {
-                                        "boundObject" : {"@": "owner"},
+                            "boundObject" : {"@": "owner"},
-                                        "boundObjectPropertyPath" : "layerName",
+                            "boundObjectPropertyPath" : "layerName",
-                                        "oneway" : true
+                            "oneway" : true
-                                }
+                        }
-                        }
+                    }
-                    },
+                },
-                    "dtext2" : {
+                "dtext2" : {
-                        "prototype" : "montage/ui/dynamic-text.reel",
+                    "prototype" : "montage/ui/dynamic-text.reel",
-                        "properties" : {
+                    "properties" : {
-                                "element" : {"#" : "layer-tag"}
+                        "element" : {"#" : "layer-tag"}
-                        },
+                    },
-                        "bindings" : {
+                    "bindings" : {
-                                "value" : {
+                        "value" : {
-                                        "boundObject" : {"@": "owner"},
+                            "boundObject" : {"@": "owner"},
-                                        "boundObjectPropertyPath" : "layerTag",
+                            "boundObjectPropertyPath" : "layerTag",
-                                        "oneway" : false
+                            "oneway" : false
-                                }
+                        }
-                        }
+                    }
-                    },
+                },
-                    "repetition1": {
+                "repetition1": {
-                        "prototype": "montage/ui/repetition.reel",
+                    "prototype": "montage/ui/repetition.reel",
-                        "properties": {
+                    "properties": {
-                            "element": {"#": "style-container"},
+                        "element": {"#": "style-container"},
-                            "isSelectionEnabled" : true
+                        "isSelectionEnabled" : true
-                        },
+                    },
-                        "bindings": {
+                    "bindings": {
-                            "objects": {
+                        "objects": {
-                                "boundObject": {"@": "owner"},
+                            "boundObject": {"@": "owner"},
-                                "boundObjectPropertyPath": "arrLayerStyles",
+                            "boundObjectPropertyPath": "arrLayerStyles",
-                                "oneway": false
+                            "oneway": false
-                            }
+                        }
-                        }
+                    }
-                    },
+                },
-                    "style" : {
+                "style" : {
-                        "prototype" : "js/panels/Timeline/Style.reel[LayerStyle]",
+                    "prototype" : "js/panels/Timeline/Style.reel[LayerStyle]",
-                        "properties" : {
+                    "properties" : {
-                                "element" : {"#" : "layer-style"}
+                        "element" : {"#" : "layer-style"}
-                        },
+                    },
-                        "bindings" : {
+                    "bindings" : {
-                                "styleID" : {
+                        "styleID" : {
-                                        "boundObject" : {"@": "repetition1"},
+                            "boundObject" : {"@": "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.styleID",
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.styleID",
-                                        "oneway" : false
+                            "oneway" : false
-                                },
+                        },
-                                "whichView" : {
+                        "whichView" : {
-                                        "boundObject" : {"@": "repetition1"},
+                            "boundObject" : {"@": "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.whichView",
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.whichView",
-                                        "oneway" : false
+                            "oneway" : false
-                                },
+                        },
-                                "editorProperty" : {
+                        "editorProperty" : {
-                                        "boundObject" : {"@": "repetition1"},
+                            "boundObject" : {"@": "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.editorProperty",
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.editorProperty",
-                                        "oneway" : false
+                            "oneway" : false
-                                },
+                        },
-                                "isSelected" : {
+                        "isSelected" : {
-                                        "boundObject" : {"@": "repetition1"},
+                            "boundObject" : {"@": "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
-                                        "oneway" : false
+                            "oneway" : false
-                                },
+                        },
-                                "isActive" : {
+                        "isActive" : {
-                                        "boundObject" : {"@": "repetition1"},
+                            "boundObject" : {"@": "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isActive",
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.isActive",
-                                        "oneway" : false
+                            "oneway" : false
-                                },
+                        },
-                                "editorValue" : {
+                        "editorValue" : {
-                                        "boundObject" : {"@": "repetition1"},
+                            "boundObject" : {"@": "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.editorValue",
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.editorValue",
-                                        "oneway" : false
+                            "oneway" : false
-                                },
+                        },
-                                "ruleTweener" : {
+                        "ruleTweener" : {
-                                        "boundObject" : {"@": "repetition1"},
+                            "boundObject" : {"@": "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener",
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener",
-                                        "oneway" : false
+                            "oneway" : false
-                                },
+                        },
                        "colorelement" : {
                            "boundObject" : {"@": "repetition1"},
                            "boundObjectPropertyPath" : "objectAtCurrentIteration.colorelement",
                            "oneway" : false
                        }
-                        }
+                    }
-                    },
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/Layer.reel
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 3c471952..cfba0e7e 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.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,24 +29,24 @@ 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/Layer.css">	34	<link rel="stylesheet" type="text/css" href="css/Layer.css">
35	<script type="text/montage-serialization">	35	<script type="text/montage-serialization">
36	{	36	{
37	"owner": {	37	"owner": {
38	"prototype": "js/panels/Timeline/Layer.reel",	38	"prototype": "js/panels/Timeline/Layer.reel",
39	"properties": {	39	"properties": {
40	"element": {"#": "layer"},	40	"element": {"#": "layer"},
41	"styleRepetition" : {"@":"repetition1"},	41	"styleRepetition" : {"@":"repetition1"},
42	"dynamicLayerName" : {"@":"dtext1"},	42	"dynamicLayerName" : {"@":"dtext1"},
43	"dynamicLayerTag" : {"@": "dtext2"},	43	"dynamicLayerTag" : {"@": "dtext2"},
44	"layer_label_text" : {"#": "layer-label-text"},	44	"layer_label_text" : {"#": "layer-label-text"},
45	"mainCollapser" : {"@" : "mainCollapser"},	45	"mainCollapser" : {"@" : "mainCollapser"},
46	"positionCollapser" : {"@" : "positionCollapser"},	46	"positionCollapser" : {"@" : "positionCollapser"},
47	"styleCollapser" : {"@" : "styleCollapser"},	47	"styleCollapser" : {"@" : "styleCollapser"},
48	"clickerMain" : {"#" : "clicker-main"},	48	"clickerMain" : {"#" : "clicker-main"},
49	"myLabel" : {"#" : "myLabel"},	49	"myLabel" : {"#" : "myLabel"},
50	"leftControl": {"@" : "dtext_position_x"},	50	"leftControl": {"@" : "dtext_position_x"},
51	"topControl": {"@" : "dtext_position_y"},	51	"topControl": {"@" : "dtext_position_y"},
52	"widthControl": {"@" : "dtext_scale_x"},	52	"widthControl": {"@" : "dtext_scale_x"},
@@ -56,256 +56,256 @@ POSSIBILITY OF SUCH DAMAGE.
56	"visibilityButton":{"#" : "visibilityButton"}	56	"visibilityButton":{"#" : "visibilityButton"}
57	}	57	}
58	},	58	},
59	"dtext1" : {	59	"dtext1" : {
60	"prototype" : "montage/ui/dynamic-text.reel",	60	"prototype" : "montage/ui/dynamic-text.reel",
61	"properties" : {	61	"properties" : {
62	"element" : {"#" : "layer-label-text"}	62	"element" : {"#" : "layer-label-text"}
63	},	63	},
64	"bindings" : {	64	"bindings" : {
65	"value" : {	65	"value" : {
66	"boundObject" : {"@": "owner"},	66	"boundObject" : {"@": "owner"},
67	"boundObjectPropertyPath" : "layerName",	67	"boundObjectPropertyPath" : "layerName",
68	"oneway" : true	68	"oneway" : true
69	}	69	}
70	}	70	}
71	},	71	},
72	"dtext2" : {	72	"dtext2" : {
73	"prototype" : "montage/ui/dynamic-text.reel",	73	"prototype" : "montage/ui/dynamic-text.reel",
74	"properties" : {	74	"properties" : {
75	"element" : {"#" : "layer-tag"}	75	"element" : {"#" : "layer-tag"}
76	},	76	},
77	"bindings" : {	77	"bindings" : {
78	"value" : {	78	"value" : {
79	"boundObject" : {"@": "owner"},	79	"boundObject" : {"@": "owner"},
80	"boundObjectPropertyPath" : "layerTag",	80	"boundObjectPropertyPath" : "layerTag",
81	"oneway" : false	81	"oneway" : false
82	}	82	}
83	}	83	}
84	},	84	},
85	"repetition1": {	85	"repetition1": {
86	"prototype": "montage/ui/repetition.reel",	86	"prototype": "montage/ui/repetition.reel",
87	"properties": {	87	"properties": {
88	"element": {"#": "style-container"},	88	"element": {"#": "style-container"},
89	"isSelectionEnabled" : true	89	"isSelectionEnabled" : true
90	},	90	},
91	"bindings": {	91	"bindings": {
92	"objects": {	92	"objects": {
93	"boundObject": {"@": "owner"},	93	"boundObject": {"@": "owner"},
94	"boundObjectPropertyPath": "arrLayerStyles",	94	"boundObjectPropertyPath": "arrLayerStyles",
95	"oneway": false	95	"oneway": false
96	}	96	}
97	}	97	}
98	},	98	},
99	"style" : {	99	"style" : {
100	"prototype" : "js/panels/Timeline/Style.reel[LayerStyle]",	100	"prototype" : "js/panels/Timeline/Style.reel[LayerStyle]",
101	"properties" : {	101	"properties" : {
102	"element" : {"#" : "layer-style"}	102	"element" : {"#" : "layer-style"}
103	},	103	},
104	"bindings" : {	104	"bindings" : {
105	"styleID" : {	105	"styleID" : {
106	"boundObject" : {"@": "repetition1"},	106	"boundObject" : {"@": "repetition1"},
107	"boundObjectPropertyPath" : "objectAtCurrentIteration.styleID",	107	"boundObjectPropertyPath" : "objectAtCurrentIteration.styleID",
108	"oneway" : false	108	"oneway" : false
109	},	109	},
110	"whichView" : {	110	"whichView" : {
111	"boundObject" : {"@": "repetition1"},	111	"boundObject" : {"@": "repetition1"},
112	"boundObjectPropertyPath" : "objectAtCurrentIteration.whichView",	112	"boundObjectPropertyPath" : "objectAtCurrentIteration.whichView",
113	"oneway" : false	113	"oneway" : false
114	},	114	},
115	"editorProperty" : {	115	"editorProperty" : {
116	"boundObject" : {"@": "repetition1"},	116	"boundObject" : {"@": "repetition1"},
117	"boundObjectPropertyPath" : "objectAtCurrentIteration.editorProperty",	117	"boundObjectPropertyPath" : "objectAtCurrentIteration.editorProperty",
118	"oneway" : false	118	"oneway" : false
119	},	119	},
120	"isSelected" : {	120	"isSelected" : {
121	"boundObject" : {"@": "repetition1"},	121	"boundObject" : {"@": "repetition1"},
122	"boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",	122	"boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
123	"oneway" : false	123	"oneway" : false
124	},	124	},
125	"isActive" : {	125	"isActive" : {
126	"boundObject" : {"@": "repetition1"},	126	"boundObject" : {"@": "repetition1"},
127	"boundObjectPropertyPath" : "objectAtCurrentIteration.isActive",	127	"boundObjectPropertyPath" : "objectAtCurrentIteration.isActive",
128	"oneway" : false	128	"oneway" : false
129	},	129	},
130	"editorValue" : {	130	"editorValue" : {
131	"boundObject" : {"@": "repetition1"},	131	"boundObject" : {"@": "repetition1"},
132	"boundObjectPropertyPath" : "objectAtCurrentIteration.editorValue",	132	"boundObjectPropertyPath" : "objectAtCurrentIteration.editorValue",
133	"oneway" : false	133	"oneway" : false
134	},	134	},
135	"ruleTweener" : {	135	"ruleTweener" : {
136	"boundObject" : {"@": "repetition1"},	136	"boundObject" : {"@": "repetition1"},
137	"boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener",	137	"boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener",
138	"oneway" : false	138	"oneway" : false
139	},	139	},
140	"colorelement" : {	140	"colorelement" : {
141	"boundObject" : {"@": "repetition1"},	141	"boundObject" : {"@": "repetition1"},
142	"boundObjectPropertyPath" : "objectAtCurrentIteration.colorelement",	142	"boundObjectPropertyPath" : "objectAtCurrentIteration.colorelement",
143	"oneway" : false	143	"oneway" : false
144	}	144	}
145	}	145	}
146	},