aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJon Reid2012-02-23 17:06:48 -0800
committerJon Reid2012-02-23 17:06:48 -0800
commit0b18fb2fef124a26204d5dba90cd82c975b69df3 (patch)
treea7000ef9547b2c95ba5706b1a378459e4bbcfb6a /js
parent0327073eff62d4b800206ba0f3ba2140ae5da8bc (diff)
downloadninja-0b18fb2fef124a26204d5dba90cd82c975b69df3.tar.gz
Timeline: Add hottext fields to layers and serialize them throughout.
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html153
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js134
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css29
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html35
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js12
6 files changed, 336 insertions, 33 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index e262afe2..df03cbb3 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -87,7 +87,140 @@
87 "oneway" : false 87 "oneway" : false
88 } 88 }
89 } 89 }
90 } 90 },
91 "dtext-position-x" : {
92 "module": "js/components/hottextunit.reel",
93 "name": "HotTextUnit",
94 "properties": {
95 "element": {"#": "position-x"},
96 "maxValue" : 100000,
97 "minValue" : -100000,
98 "acceptableUnits" : "px",
99 "units" : "px",
100 "value" : 0
101 },
102 "bindings": {
103 "value": {
104 "boundObject": {"@": "owner"},
105 "boundObjectPropertyPath": "dtextPositionX",
106 "oneway": false
107 }
108 }
109 },
110 "dtext-position-y" : {
111 "module": "js/components/hottextunit.reel",
112 "name": "HotTextUnit",
113 "properties": {
114 "element": {"#": "position-y"},
115 "maxValue" : 100000,
116 "minValue" : -100000,
117 "acceptableUnits" : "px",
118 "units" : "px",
119 "value" : 0
120 },
121 "bindings": {
122 "value": {
123 "boundObject": {"@": "owner"},
124 "boundObjectPropertyPath": "dtextPositionY",
125 "oneway": false
126 }
127 }
128 },
129 "dtext-scale-x" : {
130 "module": "js/components/hottextunit.reel",
131 "name": "HotTextUnit",
132 "properties": {
133 "element": {"#": "scale-x"},
134 "maxValue" : 100,
135 "minValue" : 0,
136 "acceptableUnits" : "%",
137 "units" : "%",
138 "value" : 0
139 },
140 "bindings": {
141 "value": {
142 "boundObject": {"@": "owner"},
143 "boundObjectPropertyPath": "dtextScaleX",
144 "oneway": false
145 }
146 }
147 },
148 "dtext-scale-y" : {
149 "module": "js/components/hottextunit.reel",
150 "name": "HotTextUnit",
151 "properties": {
152 "element": {"#": "scale-y"},
153 "maxValue" : 100,
154 "minValue" : 0,
155 "acceptableUnits" : "%",
156 "units" : "%",
157 "value" : 0
158 },
159 "bindings": {
160 "value": {
161 "boundObject": {"@": "owner"},
162 "boundObjectPropertyPath": "dtextScaleY",
163 "oneway": false
164 }
165 }
166 },
167 "dtext-skew-x" : {
168 "module": "js/components/hottextunit.reel",
169 "name": "HotTextUnit",
170 "properties": {
171 "element": {"#": "skew-x"},
172 "maxValue" : 100,
173 "minValue" : 0,
174 "acceptableUnits" : "%",
175 "units" : "%",
176 "value" : 0
177 },
178 "bindings": {
179 "value": {
180 "boundObject": {"@": "owner"},
181 "boundObjectPropertyPath": "dtextSkewX",
182 "oneway": false
183 }
184 }
185 },
186 "dtext-skew-y" : {
187 "module": "js/components/hottextunit.reel",
188 "name": "HotTextUnit",
189 "properties": {
190 "element": {"#": "skew-y"},
191 "maxValue" : 100,
192 "minValue" : 0,
193 "acceptableUnits" : "%",
194 "units" : "%",
195 "value" : 0
196 },
197 "bindings": {
198 "value": {
199 "boundObject": {"@": "owner"},
200 "boundObjectPropertyPath": "dtextSkewY",
201 "oneway": false
202 }
203 }
204 },
205 "dtext-rotate" : {
206 "module": "js/components/hottextunit.reel",
207 "name": "HotTextUnit",
208 "properties": {
209 "element": {"#": "rotation"},
210 "maxValue" : 360,
211 "minValue" : -360,
212 "acceptableUnits" : "degrees",
213 "units" : "degrees",
214 "value" : 0
215 },
216 "bindings": {
217 "value": {
218 "boundObject": {"@": "owner"},
219 "boundObjectPropertyPath": "dtextRotate",
220 "oneway": false
221 }
222 }
223 }
91 } 224 }
92 </script> 225 </script>
93 </head> 226 </head>
@@ -109,15 +242,11 @@
109 <div class="layout-table"> 242 <div class="layout-table">
110 <div class="layout-row"> 243 <div class="layout-row">
111 <div class="layout-cell">X</div> 244 <div class="layout-cell">X</div>
112 <div class="layout-cell">100px</div> 245 <div class="layout-cell"><div id="position-x"></div></div>
113 </div> 246 </div>
114 <div class="layout-row"> 247 <div class="layout-row">
115 <div class="layout-cell">Y</div> 248 <div class="layout-cell">Y</div>
116 <div class="layout-cell">100px</div> 249 <div class="layout-cell"><div id="position-y"></div></div>
117 </div>
118 <div class="layout-row">
119 <div class="layout-cell">Z</div>
120 <div class="layout-cell">100px</div>
121 </div> 250 </div>
122 </div> 251 </div>
123 </div> 252 </div>
@@ -129,23 +258,23 @@
129 <div class="layout-table"> 258 <div class="layout-table">
130 <div class="layout-row"> 259 <div class="layout-row">
131 <div class="layout-cell">Scale X</div> 260 <div class="layout-cell">Scale X</div>
132 <div class="layout-cell">100px</div> 261 <div class="layout-cell"><div id="scale-x"></div></div>
133 </div> 262 </div>
134 <div class="layout-row"> 263 <div class="layout-row">
135 <div class="layout-cell">Scale Y</div> 264 <div class="layout-cell">Scale Y</div>
136 <div class="layout-cell">100px</div> 265 <div class="layout-cell"><div id="scale-y"></div></div>
137 </div> 266 </div>
138 <div class="layout-row"> 267 <div class="layout-row">
139 <div class="layout-cell">Skew X</div> 268 <div class="layout-cell">Skew X</div>
140 <div class="layout-cell">100px</div> 269 <div class="layout-cell"><div id="skew-x"></div></div>
141 </div> 270 </div>
142 <div class="layout-row"> 271 <div class="layout-row">
143 <div class="layout-cell">Skew Y</div> 272 <div class="layout-cell">Skew Y</div>
144 <div class="layout-cell">100px</div> 273 <div class="layout-cell"><div id="skew-y"></div></div>
145 </div> 274 </div>
146 <div class="layout-row"> 275 <div class="layout-row">
147 <div class="layout-cell">Rotation</div> 276