diff options
author | hwc487 | 2012-02-28 12:58:09 -0800 |
---|---|---|
committer | hwc487 | 2012-02-28 12:58:09 -0800 |
commit | 347fc28227d822e9fea3fa823fae79cf14ea041c (patch) | |
tree | 180e7ee1ad092397b05c0452e75d456fa0a3abb7 /js/panels/Timeline/Layer.reel/Layer.html | |
parent | ed16298e4323b733f6dc957c307dc07036fa3569 (diff) | |
parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
download | ninja-347fc28227d822e9fea3fa823fae79cf14ea041c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 153 |
1 files changed, 141 insertions, 12 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index a3fbd5b1..0bd448f7 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
@@ -92,7 +92,140 @@ | |||
92 | "oneway" : false | 92 | "oneway" : false |
93 | } | 93 | } |
94 | } | 94 | } |
95 | } | 95 | }, |
96 | "dtext_position_x" : { | ||
97 | "module": "js/components/hottextunit.reel", | ||
98 | "name": "HotTextUnit", | ||
99 | "properties": { | ||
100 | "element": {"#": "position-x"}, | ||
101 | "maxValue" : 100000, | ||
102 | "minValue" : -100000, | ||
103 | "acceptableUnits" : "px", | ||
104 | "units" : "px", | ||
105 | "value" : 0 | ||
106 | }, | ||
107 | "bindings": { | ||
108 | "value": { | ||
109 | "boundObject": {"@": "owner"}, | ||
110 | "boundObjectPropertyPath": "dtextPositionX", | ||
111 | "oneway": false | ||
112 | } | ||
113 | } | ||
114 | }, | ||
115 | "dtext_position_y" : { | ||
116 | "module": "js/components/hottextunit.reel", | ||
117 | "name": "HotTextUnit", | ||
118 | "properties": { | ||
119 | "element": {"#": "position-y"}, | ||
120 | "maxValue" : 100000, | ||
121 | "minValue" : -100000, | ||
122 | "acceptableUnits" : "px", | ||
123 | "units" : "px", | ||
124 | "value" : 0 | ||
125 | }, | ||
126 | "bindings": { | ||
127 | "value": { | ||
128 | "boundObject": {"@": "owner"}, | ||
129 | "boundObjectPropertyPath": "dtextPositionY", | ||
130 | "oneway": false | ||
131 | } | ||
132 | } | ||
133 | }, | ||
134 | "dtext_scale_x" : { | ||
135 | "module": "js/components/hottextunit.reel", | ||
136 | "name": "HotTextUnit", | ||
137 | "properties": { | ||
138 | "element": {"#": "scale-x"}, | ||
139 | "maxValue" : 100, | ||
140 | "minValue" : 0, | ||
141 | "acceptableUnits" : "%", | ||
142 | "units" : "%", | ||
143 | "value" : 0 | ||
144 | }, | ||
145 | "bindings": { | ||
146 | "value": { | ||
147 | "boundObject": {"@": "owner"}, | ||
148 | "boundObjectPropertyPath": "dtextScaleX", | ||
149 | "oneway": false | ||
150 | } | ||
151 | } | ||
152 | }, | ||
153 | "dtext_scale_y" : { | ||
154 | "module": "js/components/hottextunit.reel", | ||
155 | "name": "HotTextUnit", | ||
156 | "properties": { | ||
157 | "element": {"#": "scale-y"}, | ||
158 | "maxValue" : 100, | ||
159 | "minValue" : 0, | ||
160 | "acceptableUnits" : "%", | ||
161 | "units" : "%", | ||
162 | "value" : 0 | ||
163 | }, | ||
164 | "bindings": { | ||
165 | "value": { | ||
166 | "boundObject": {"@": "owner"}, | ||
167 | "boundObjectPropertyPath": "dtextScaleY", | ||
168 | "oneway": false | ||
169 | } | ||
170 | } | ||
171 | }, | ||
172 | "dtext_skew_x" : { | ||
173 | "module": "js/components/hottextunit.reel", | ||
174 | "name": "HotTextUnit", | ||
175 | "properties": { | ||
176 | "element": {"#": "skew-x"}, | ||
177 | "maxValue" : 100, | ||
178 | "minValue" : 0, | ||
179 | "acceptableUnits" : "%", | ||
180 | "units" : "%", | ||
181 | "value" : 0 | ||
182 | }, | ||
183 | "bindings": { | ||
184 | "value": { | ||
185 | "boundObject": {"@": "owner"}, | ||
186 | "boundObjectPropertyPath": "dtextSkewX", | ||
187 | "oneway": false | ||
188 | } | ||
189 | } | ||
190 | }, | ||
191 | "dtext_skew_y" : { | ||
192 | "module": "js/components/hottextunit.reel", | ||
193 | "name": "HotTextUnit", | ||
194 | "properties": { | ||
195 | "element": {"#": "skew-y"}, | ||
196 | "maxValue" : 100, | ||
197 | "minValue" : 0, | ||
198 | "acceptableUnits" : "%", | ||
199 | "units" : "%", | ||
200 | "value" : 0 | ||
201 | }, | ||
202 | "bindings": { | ||
203 | "value": { | ||
204 | "boundObject": {"@": "owner"}, | ||
205 | "boundObjectPropertyPath": "dtextSkewY", | ||
206 | "oneway": false | ||
207 | } | ||
208 | } | ||
209 | }, | ||
210 | "dtext_rotate" : { | ||
211 | "module": "js/components/hottextunit.reel", | ||
212 | "name": "HotTextUnit", | ||
213 | "properties": { | ||
214 | "element": {"#": "rotation"}, | ||
215 | "maxValue" : 360, | ||
216 | "minValue" : -360, | ||
217 | "acceptableUnits" : "degrees", | ||
218 | "units" : "degrees", | ||
219 | "value" : 0 | ||
220 | }, | ||
221 | "bindings": { | ||
222 | "value": { | ||
223 | "boundObject": {"@": "owner"}, | ||
224 | "boundObjectPropertyPath": "dtextRotate", | ||
225 | "oneway": false | ||
226 | } | ||
227 | } | ||
228 | } | ||
96 | } | 229 | } |
97 | </script> | 230 | </script> |
98 | </head> | 231 | </head> |
@@ -114,15 +247,11 @@ | |||
114 | <div class="layout-table"> | 247 | <div class="layout-table"> |
115 | <div class="layout-row"> | 248 | <div class="layout-row"> |
116 | <div class="layout-cell">X</div> | 249 | <div class="layout-cell">X</div> |
117 | <div class="layout-cell">100px</div> | 250 | <div class="layout-cell"><div id="position-x"></div></div> |
118 | </div> | 251 | </div> |
119 | <div class="layout-row"> | 252 | <div class="layout-row"> |
120 | <div class="layout-cell">Y</div> | 253 | <div class="layout-cell">Y</div> |
121 | <div class="layout-cell">100px</div> | 254 | <div class="layout-cell"><div id="position-y"></div></div> |
122 | </div> | ||
123 | <div class="layout-row"> | ||
124 | <div class="layout-cell">Z</div> | ||
125 | <div class="layout-cell">100px</div> | ||
126 | </div> | 255 | </div> |
127 | </div> | 256 | </div> |
128 | </div> | 257 | </div> |
@@ -134,23 +263,23 @@ | |||
134 | <div class="layout-table"> | 263 | <div class="layout-table"> |
135 | <div class="layout-row"> | 264 | <div class="layout-row"> |
136 | <div class="layout-cell">Scale X</div> | 265 | <div class="layout-cell">Scale X</div> |
137 | <div class="layout-cell">100px</div> | 266 | <div class="layout-cell"><div id="scale-x"></div></div> |
138 | </div> | 267 | </div> |
139 | <div class="layout-row"> | 268 | <div class="layout-row"> |
140 | <div class="layout-cell">Scale Y</div> | 269 | <div class="layout-cell">Scale Y</div> |
141 | <div class="layout-cell">100px</div> | 270 | <div class="layout-cell"><div id="scale-y"></div></div> |
142 | </div> | 271 | </div> |
143 | <div class="layout-row"> | 272 | <div class="layout-row"> |
144 | <div class="layout-cell">Skew X</div> | 273 | <div class="layout-cell">Skew X</div> |
145 | <div class="layout-cell">100px</div> | 274 | <div class="layout-cell"><div id="skew-x"></div></div> |
146 | </div> | 275 | </div> |
147 | <div class="layout-row"> | 276 | <div class="layout-row"> |
148 | <div class="layout-cell">Skew Y</div> | 277 | <div class="layout-cell">Skew Y</div> |
149 | <div class="layout-cell">100px</div> | 278 | <div class="layout-cell"><div id="skew-y"></div></div> |
150 | </div> | 279 | </div> |
151 | <div class="layout-row"> | 280 | <div class="layout-row"> |
152 | <div class="layout-cell">Rotation</div> | 281 | <div class="layout-cell">Rotation</div> |
153 | <div class="layout-cell">100px</div> |