diff options
author | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-23 17:05:43 -0800 |
commit | afc53c6f553c97ab778154154aa2b7a146cb5fef (patch) | |
tree | 66b5ec886a49894feda44ccf8b5233ef39a46536 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
parent | 8974ecd564563a991ff96f9cb6d47da172174242 (diff) | |
parent | db2fd02a1b0e909bb536fa63cefd2144f4642ead (diff) | |
download | ninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz |
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 333 |
1 files changed, 276 insertions, 57 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 62688825..61da9e36 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -10,10 +10,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
10 | }, | 10 | }, |
11 | 11 | ||
12 | _trackID:{ | 12 | _trackID:{ |
13 | value:null, | ||
14 | writable:true, | ||
15 | serializable:true, | 13 | serializable:true, |
16 | enumerable:true | 14 | value:null |
17 | }, | 15 | }, |
18 | 16 | ||
19 | trackID:{ | 17 | trackID:{ |
@@ -85,21 +83,116 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
85 | } | 83 | } |
86 | } | 84 | } |
87 | }, | 85 | }, |
88 | 86 | ||
89 | _tweens:{ | 87 | _arrStyleTracks : { |
88 | serializable:true, | ||
89 | enumerable:true, | ||
90 | value: [] | ||
91 | }, | ||
92 | arrStyleTracks: { | ||
93 | serializable:true, | ||
94 | enumerable:true, | ||
95 | get: function() { | ||
96 | return this._arrStyleTracks; | ||
97 | }, | ||
98 | set: function(newVal) { | ||
99 | this._arrStyleTracks = newVal; | ||
100 | this.needsDraw = true; | ||
101 | } | ||
102 | }, | ||
103 | _styleTracksRepetition: { | ||
104 | serializable: true, | ||
105 | value: null | ||
106 | }, | ||
107 | styleTracksRepetition : { | ||
108 | serializable: true, | ||
109 | get: function() { | ||
110 | return this._styleTracksRepetition; | ||
111 | }, | ||
112 | set: function(newVal) { | ||
113 | this._styleTracksRepetition = newVal; | ||
114 | this.needsDraw = true; | ||
115 | } | ||
116 | }, | ||
117 | |||
118 | /* Position Property Tracks */ | ||
119 | _arrPositionTracks : { | ||
120 | serializable:true, | ||
121 | enumerable:true, | ||
122 | value: [] | ||
123 | }, | ||
124 | arrPositionTracks: { | ||
125 | serializable:true, | ||
126 | enumerable:true, | ||
127 | get: function() { | ||
128 | return this._arrPositionTracks; | ||
129 | }, | ||
130 | set: function(newVal) { | ||
131 | this._arrPositionTracks = newVal; | ||
132 | this.needsDraw = true; | ||
133 | } | ||
134 | }, | ||
135 | _positionTracksRepetition: { | ||
136 | serializable: true, | ||
137 | value: null | ||
138 | }, | ||
139 | positionTracksRepetition : { | ||
140 | serializable: true, | ||
141 | get: function() { | ||
142 | return this._positionTracksRepetition; | ||
143 | }, | ||
144 | set: function(newVal) { | ||
145 | this._positionTracksRepetition = newVal; | ||
146 | this.needsDraw = true; | ||
147 | } | ||
148 | }, | ||
149 | |||
150 | |||
151 | /* Transform Property Tracks */ | ||
152 | _arrTransformTracks : { | ||
90 | serializable:true, | 153 | serializable:true, |
91 | enumerable:true, | 154 | enumerable:true, |
155 | value: [] | ||
156 | }, | ||
157 | arrTransformTracks: { | ||
158 | serializable:true, | ||
159 | enumerable:true, | ||
160 | get: function() { | ||
161 | return this._arrTransformTracks; | ||
162 | }, | ||
163 | set: function(newVal) { | ||
164 | this._arrTransformTracks = newVal; | ||
165 | this.needsDraw = true; | ||
166 | } | ||
167 | }, | ||
168 | _transformTracksRepetition: { | ||
169 | serializable: true, | ||
170 | value: null | ||
171 | }, | ||
172 | transformTracksRepetition : { | ||
173 | serializable: true, | ||
174 | get: function() { | ||
175 | return this._transformTracksRepetition; | ||
176 | }, | ||
177 | set: function(newVal) { | ||
178 | this._transformTracksRepetition = newVal; | ||
179 | this.needsDraw = true; | ||
180 | } | ||
181 | }, | ||
182 | |||
183 | _tweens:{ | ||
184 | enumerable: false, | ||
92 | value:[] | 185 | value:[] |
93 | }, | 186 | }, |
94 | 187 | ||
95 | tweens:{ | 188 | tweens:{ |
96 | serializable:true, | 189 | serializable:true, |
97 | enumerable:true, | ||
98 | get:function () { | 190 | get:function () { |
99 | return this._spans; | 191 | return this._tweens; |
100 | }, | 192 | }, |
101 | set:function (newVal) { | 193 | set:function (newVal) { |
102 | this._spans = newVal; | 194 | this._tweens = newVal; |
195 | this.needsDraw=true; | ||
103 | } | 196 | } |
104 | }, | 197 | }, |
105 | 198 | ||
@@ -118,14 +211,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
118 | } | 211 | } |
119 | }, | 212 | }, |
120 | 213 | ||
214 | _trackDuration:{ | ||
215 | serializable: true, | ||
216 | value:0 | ||
217 | }, | ||
218 | |||
121 | trackDuration:{ | 219 | trackDuration:{ |
220 | serializable:true, | ||
221 | get:function () { | ||
222 | return this._trackDuration; | ||
223 | }, | ||
224 | set:function (val) { | ||
225 | this._trackDuration = val; | ||
226 | } | ||
227 | }, | ||
228 | |||
229 | _trackPosition:{ | ||
230 | serializable:true, | ||
122 | value:0 | 231 | value:0 |
123 | }, | 232 | }, |
124 | 233 | ||
125 | currentKeyframeRule:{ | 234 | trackPosition:{ |
235 | serializable:true, | ||
236 | get:function () { | ||
237 | return this._trackPosition; | ||
238 | }, | ||
239 | set:function (val) { | ||
240 | this._trackPosition = val; | ||
241 | } | ||
242 | }, | ||
243 | |||
244 | _currentKeyframeRule:{ | ||
245 | serializable: true, | ||
126 | value:null | 246 | value:null |
127 | }, | 247 | }, |
128 | 248 | ||
249 | currentKeyframeRule:{ | ||
250 | serializable: true, | ||
251 | get:function(){ | ||
252 | return this._currentKeyframeRule; | ||
253 | }, | ||
254 | set:function(val){ | ||
255 | this._currentKeyframeRule = val; | ||
256 | } | ||
257 | }, | ||
258 | |||
129 | nextKeyframe:{ | 259 | nextKeyframe:{ |
130 | value:1 | 260 | value:1 |
131 | }, | 261 | }, |
@@ -134,14 +264,23 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
134 | value:0 | 264 | value:0 |
135 | }, | 265 | }, |
136 | 266 | ||
137 | isAnimated:{ | 267 | _isTrackAnimated:{ |
138 | value:false | 268 | serializable: true, |
269 | value:null | ||
270 | }, | ||
271 | |||
272 | isTrackAnimated:{ | ||
273 | serializable: true, | ||
274 | get:function(){ | ||
275 |