aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-07 11:00:22 -0700
committerPushkar Joshi2012-05-07 11:00:22 -0700
commite5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch)
treee84d2dc5033c1b5c1b993662660a90af12584b69 /js/panels/Timeline/TimelineTrack.reel
parentba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html1
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js34
2 files changed, 1 insertions, 34 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 44ad9abb..5c5a8b76 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -15,7 +15,6 @@
15 "properties": { 15 "properties": {
16 "element": {"#": "track"}, 16 "element": {"#": "track"},
17 "tweenRepetition" : {"@" : "tweenRepetition"}, 17 "tweenRepetition" : {"@" : "tweenRepetition"},
18 "styleTracksRepetition" : {"@" : "styleTracksRepetition"},
19 "tween": {"@" : "tween"}, 18 "tween": {"@" : "tween"},
20 "_mainCollapser" : {"@" : "mainCollapser"}, 19 "_mainCollapser" : {"@" : "mainCollapser"},
21 "_positionCollapser" : {"@" : "positionCollapser"}, 20 "_positionCollapser" : {"@" : "positionCollapser"},
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index e46a5eb0..efeeba00 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -16,7 +16,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
16 }, 16 },
17 17
18 _trackID:{ 18 _trackID:{
19 serializable:true,
20 value:null 19 value:null
21 }, 20 },
22 21
@@ -105,7 +104,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
105 } 104 }
106 }, 105 },
107 _bypassAnimation : { 106 _bypassAnimation : {
108 serializable: true,
109 value: false 107 value: false
110 }, 108 },
111 bypassAnimation : { 109 bypassAnimation : {
@@ -122,13 +120,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
122 }, 120 },
123 121
124 _arrStyleTracks : { 122 _arrStyleTracks : {
125 serializable:true,
126 enumerable:true,
127 value: [] 123 value: []
128 }, 124 },
129 arrStyleTracks: { 125 arrStyleTracks: {
130 serializable:true, 126 serializable:true,
131 enumerable:true,
132 get: function() { 127 get: function() {
133 return this._arrStyleTracks; 128 return this._arrStyleTracks;
134 }, 129 },
@@ -138,11 +133,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
138 } 133 }
139 }, 134 },
140 _styleTracksRepetition: { 135 _styleTracksRepetition: {
141 serializable: true,
142 value: null 136 value: null
143 }, 137 },
144 styleTracksRepetition : { 138 styleTracksRepetition : {
145 serializable: true,
146 get: function() { 139 get: function() {
147 return this._styleTracksRepetition; 140 return this._styleTracksRepetition;
148 }, 141 },
@@ -153,13 +146,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
153 146
154 /* Position Property Tracks */ 147 /* Position Property Tracks */
155 _arrPositionTracks : { 148 _arrPositionTracks : {
156 serializable:true,
157 enumerable:true,
158 value: [] 149 value: []
159 }, 150 },
160 arrPositionTracks: { 151 arrPositionTracks: {
161 serializable:true, 152 serializable:true,
162 enumerable:true,
163 get: function() { 153 get: function() {
164 return this._arrPositionTracks; 154 return this._arrPositionTracks;
165 }, 155 },
@@ -169,11 +159,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
169 } 159 }
170 }, 160 },
171 _positionTracksRepetition: { 161 _positionTracksRepetition: {
172 serializable: true,
173 value: null 162 value: null
174 }, 163 },
175 positionTracksRepetition : { 164 positionTracksRepetition : {
176 serializable: true,
177 get: function() { 165 get: function() {
178 return this._positionTracksRepetition; 166 return this._positionTracksRepetition;
179 }, 167 },
@@ -185,13 +173,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
185 173
186 /* Transform Property Tracks */ 174 /* Transform Property Tracks */
187 _arrTransformTracks : { 175 _arrTransformTracks : {
188 serializable:true,
189 enumerable:true,
190 value: [] 176 value: []
191 }, 177 },
192 arrTransformTracks: { 178 arrTransformTracks: {
193 serializable:true, 179 serializable:true,
194 enumerable:true,
195 get: function() { 180 get: function() {
196 return this._arrTransformTracks; 181 return this._arrTransformTracks;
197 }, 182 },
@@ -201,11 +186,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
201 } 186 }
202 }, 187 },
203 _transformTracksRepetition: { 188 _transformTracksRepetition: {
204 serializable: true,
205 value: null 189 value: null
206 }, 190 },
207 transformTracksRepetition : { 191 transformTracksRepetition : {
208 serializable: true,
209 get: function() { 192 get: function() {
210 return this._transformTracksRepetition; 193 return this._transformTracksRepetition;
211 }, 194 },
@@ -215,12 +198,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
215 }, 198 },
216 199
217 _tweens:{ 200 _tweens:{
218 enumerable: false,
219 value:[] 201 value:[]
220 }, 202 },
221 203
222 tweens:{ 204 tweens:{
223 serializable:true, 205 serializable: true,
224 get:function () { 206 get:function () {
225 return this._tweens; 207 return this._tweens;
226 }, 208 },
@@ -231,12 +213,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
231 }, 213 },
232 214
233 _tweenRepetition:{ 215 _tweenRepetition:{
234 serializable:true,
235 value:null 216 value:null
236 }, 217 },
237 218
238 tweenRepetition:{ 219 tweenRepetition:{
239 serializable:true,
240 get:function () { 220 get:function () {
241 return this._spanRepetition; 221 return this._spanRepetition;
242 }, 222 },
@@ -246,7 +226,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
246 }, 226 },
247 227
248 _trackDuration:{ 228 _trackDuration:{
249 serializable: true,
250 value:0 229 value:0
251 }, 230 },
252 231
@@ -265,7 +244,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
265 }, 244 },
266 245
267 _trackPosition:{ 246 _trackPosition:{
268 serializable:true,
269 value:0 247 value:0
270 }, 248 },
271 249
@@ -281,7 +259,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
281 }, 259 },
282 260
283 _currentKeyframeRule:{ 261 _currentKeyframeRule:{
284 serializable: true,
285 value:null 262 value:null
286 }, 263 },
287 264
@@ -305,7 +282,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
305 }, 282 },
306 283
307 _isTrackAnimated:{ 284 _isTrackAnimated:{
308 serializable: true,
309 value: