diff options
author | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
commit | 7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch) | |
tree | 6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/panels/Timeline/Layer.reel | |
parent | d988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 116 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 338 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/css/Layer.css | 99 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/scss/Layer.scss | 50 |
4 files changed, 420 insertions, 183 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 79b522ee..10334b31 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 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -11,23 +11,24 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "module": "js/panels/Timeline/Layer.reel", | 14 | "prototype": "js/panels/Timeline/Layer.reel", |
15 | "name": "Layer", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": {"#": "layer"}, | 16 | "element": {"#": "layer"}, |
18 | "styleRepetition" : {"@":"repetition1"}, | 17 | "styleRepetition" : {"@":"repetition1"}, |
19 | "dynamicLayerName" : {"@":"dtext1"}, | 18 | "dynamicLayerName" : {"@":"dtext1"}, |
19 | "dynamicLayerTag" : {"@": "dtext2"}, | ||
20 | "slotStyle" : {"@":"slot1"}, | 20 | "slotStyle" : {"@":"slot1"}, |
21 | "mainCollapser" : {"@" : "mainCollapser"}, | 21 | "mainCollapser" : {"@" : "mainCollapser"}, |
22 | "positionCollapser" : {"@" : "positionCollapser"}, | 22 | "positionCollapser" : {"@" : "positionCollapser"}, |
23 | "transformCollapser" : {"@" : "transformCollapser"}, | 23 | "transformCollapser" : {"@" : "transformCollapser"}, |
24 | "styleCollapser" : {"@" : "styleCollapser"}, | 24 | "styleCollapser" : {"@" : "styleCollapser"}, |
25 | "clickerMain" : {"#" : "clicker-main"} | 25 | "clickerMain" : {"#" : "clicker-main"}, |
26 | "myLabel" : {"#" : "myLabel"}, | ||
27 | "dragDrop" : {"@" : "DragDrop"} | ||
26 | } | 28 | } |
27 | }, | 29 | }, |
28 | "dtext1" : { | 30 | "dtext1" : { |
29 | "module" : "montage/ui/dynamic-text.reel", | 31 | "prototype" : "montage/ui/dynamic-text.reel", |
30 | "name" : "DynamicText", | ||
31 | "properties" : { | 32 | "properties" : { |
32 | "element" : {"#" : "layer-label-text"} | 33 | "element" : {"#" : "layer-label-text"} |
33 | }, | 34 | }, |
@@ -39,9 +40,21 @@ | |||
39 | } | 40 | } |
40 | } | 41 | } |
41 | }, | 42 | }, |
43 | "dtext2" : { | ||
44 | "prototype" : "montage/ui/dynamic-text.reel", | ||
45 | "properties" : { | ||
46 | "element" : {"#" : "layer-tag"} | ||
47 | }, | ||
48 | "bindings" : { | ||
49 | "value" : { | ||
50 | "boundObject" : {"@": "owner"}, | ||
51 | "boundObjectPropertyPath" : "layerTag", | ||
52 | "oneway" : false | ||
53 | } | ||
54 | } | ||
55 | }, | ||
42 | "repetition1": { | 56 | "repetition1": { |
43 | "module": "montage/ui/repetition.reel", | 57 | "prototype": "montage/ui/repetition.reel", |
44 | "name": "Repetition", | ||
45 | "properties": { | 58 | "properties": { |
46 | "element": {"#": "style-container"}, | 59 | "element": {"#": "style-container"}, |
47 | "isSelectionEnabled" : true | 60 | "isSelectionEnabled" : true |
@@ -55,8 +68,7 @@ | |||
55 | } | 68 | } |
56 | }, | 69 | }, |
57 | "style" : { | 70 | "style" : { |
58 | "module" : "js/panels/Timeline/Style.reel", | 71 | "prototype" : "js/panels/Timeline/Style.reel[LayerStyle]", |
59 | "name" : "LayerStyle", | ||
60 | "properties" : { | 72 | "properties" : { |
61 | "element" : {"#" : "layer-style"} | 73 | "element" : {"#" : "layer-style"} |
62 | }, | 74 | }, |
@@ -99,8 +111,7 @@ | |||
99 | } | 111 | } |
100 | }, | 112 | }, |
101 | "dtext_position_x" : { | 113 | "dtext_position_x" : { |
102 | "module": "js/components/hottextunit.reel", | 114 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
103 | "name": "HotTextUnit", | ||
104 | "properties": { | 115 | "properties": { |
105 | "element": {"#": "position-x"}, | 116 | "element": {"#": "position-x"}, |
106 | "maxValue" : 100000, | 117 | "maxValue" : 100000, |
@@ -118,8 +129,7 @@ | |||
118 | } | 129 | } |
119 | }, | 130 | }, |
120 | "dtext_position_y" : { | 131 | "dtext_position_y" : { |
121 | "module": "js/components/hottextunit.reel", | 132 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
122 | "name": "HotTextUnit", | ||
123 | "properties": { | 133 | "properties": { |
124 | "element": {"#": "position-y"}, | 134 | "element": {"#": "position-y"}, |
125 | "maxValue" : 100000, | 135 | "maxValue" : 100000, |
@@ -137,8 +147,7 @@ | |||
137 | } | 147 | } |
138 | }, | 148 | }, |
139 | "dtext_scale_x" : { | 149 | "dtext_scale_x" : { |
140 | "module": "js/components/hottextunit.reel", | 150 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
141 | "name": "HotTextUnit", | ||
142 | "properties": { | 151 | "properties": { |
143 | "element": {"#": "scale-x"}, | 152 | "element": {"#": "scale-x"}, |
144 | "maxValue" : 100, | 153 | "maxValue" : 100, |
@@ -156,8 +165,7 @@ | |||
156 | } | 165 | } |
157 | }, | 166 | }, |
158 | "dtext_scale_y" : { | 167 | "dtext_scale_y" : { |
159 | "module": "js/components/hottextunit.reel", | 168 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
160 | "name": "HotTextUnit", | ||
161 | "properties": { | 169 | "properties": { |
162 | "element": {"#": "scale-y"}, | 170 | "element": {"#": "scale-y"}, |
163 | "maxValue" : 100, | 171 | "maxValue" : 100, |
@@ -175,8 +183,7 @@ | |||
175 | } | 183 | } |
176 | }, | 184 | }, |
177 | "dtext_skew_x" : { | 185 | "dtext_skew_x" : { |
178 | "module": "js/components/hottextunit.reel", | 186 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
179 | "name": "HotTextUnit", | ||
180 | "properties": { | 187 | "properties": { |
181 | "element": {"#": "skew-x"}, | 188 | "element": {"#": "skew-x"}, |
182 | "maxValue" : 100, | 189 | "maxValue" : 100, |
@@ -194,8 +201,7 @@ | |||
194 | } | 201 | } |
195 | }, | 202 | }, |
196 | "dtext_skew_y" : { | 203 | "dtext_skew_y" : { |
197 | "module": "js/components/hottextunit.reel", | 204 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
198 | "name": "HotTextUnit", | ||
199 | "properties": { | 205 | "properties": { |
200 | "element": {"#": "skew-y"}, | 206 | "element": {"#": "skew-y"}, |
201 | "maxValue" : 100, | 207 | "maxValue" : 100, |
@@ -213,8 +219,7 @@ | |||
213 | } | 219 | } |
214 | }, | 220 | }, |
215 | "dtext_rotate" : { | 221 | "dtext_rotate" : { |
216 | "module": "js/components/hottextunit.reel", | 222 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
217 | "name": "HotTextUnit", | ||
218 | "properties": { | 223 | "properties": { |
219 | "element": {"#": "rotation"}, | 224 | "element": {"#": "rotation"}, |
220 | "maxValue" : 360, | 225 | "maxValue" : 360, |
@@ -233,8 +238,7 @@ | |||
233 | }, | 238 | }, |
234 | 239 | ||
235 | "mainCollapser" : { | 240 | "mainCollapser" : { |
236 | "module" : "js/panels/timeline/Collapser.js", | 241 | "prototype" : "js/panels/timeline/Collapser", |
237 | "name" : "Collapser", | ||
238 | "properties" : { | 242 | "properties" : { |
239 | "element" : {"#" : "content-main"}, | 243 | "element" : {"#" : "content-main"}, |
240 | "myContent" : {"#" : "content-main"}, | 244 | "myContent" : {"#" : "content-main"}, |
@@ -254,8 +258,7 @@ | |||
254 | }, | 258 | }, |
255 | 259 | ||
256 | "positionCollapser" : { | 260 | "positionCollapser" : { |
257 | "module" : "js/panels/timeline/Collapser.js", | 261 | "prototype" : "js/panels/timeline/Collapser", |
258 | "name" : "Collapser", | ||
259 | "properties" : { | 262 | "properties" : { |
260 | "element" : {"#" : "content-position"}, | 263 | "element" : {"#" : "content-position"}, |
261 | "myContent" : {"#":"content-position"}, | 264 | "myContent" : {"#":"content-position"}, |
@@ -275,8 +278,7 @@ | |||
275 | }, | 278 | }, |
276 | 279 | ||
277 | "transformCollapser" : { | 280 | "transformCollapser" : { |
278 | "module" : "js/panels/timeline/Collapser.js", | 281 | "prototype" : "js/panels/timeline/Collapser", |
279 | "name" : "Collapser", |