aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-12 11:13:39 -0700
committerValerio Virgillito2012-06-12 11:13:39 -0700
commitc08220b45b9a22e87955671a5223c6c55b78053b (patch)
tree0af1aaf4f781061191e0541bdbaf51b24f4b9413 /js/panels/Timeline/TimelineTrack.reel
parent471776facca730c57b0f6b8448535914df6624fd (diff)
parent962d8d11c68761a1c3c89289dc0f6d9de07da755 (diff)
downloadninja-c08220b45b9a22e87955671a5223c6c55b78053b.tar.gz
Merge branch 'montage-v10-integration' of github.com:Motorola-Mobility/ninja-internal into montage-v10-integration
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html8
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js55
2 files changed, 55 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 5c5a8b76..091470f3 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -16,10 +16,10 @@
16 "element": {"#": "track"}, 16 "element": {"#": "track"},
17 "tweenRepetition" : {"@" : "tweenRepetition"}, 17 "tweenRepetition" : {"@" : "tweenRepetition"},
18 "tween": {"@" : "tween"}, 18 "tween": {"@" : "tween"},
19 "_mainCollapser" : {"@" : "mainCollapser"}, 19 "mainCollapser" : {"@" : "mainCollapser"},
20 "_positionCollapser" : {"@" : "positionCollapser"}, 20 "positionCollapser" : {"@" : "positionCollapser"},
21 "_transformCollapser" : {"@" : "transformCollapser"}, 21 "transformCollapser" : {"@" : "transformCollapser"},
22 "_styleCollapser" : {"@" : "styleCollapser"} 22 "styleCollapser" : {"@" : "styleCollapser"}
23 } 23 }
24 }, 24 },
25 25
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 75997466..87a5e156 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -11,10 +11,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
11 11
12var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { 12var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
13 13
14 tween: {
15 value: null
16 },
17
18 _trackID:{ 14 _trackID:{
19 value:null 15 value:null
20 }, 16 },
@@ -31,6 +27,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
31 } 27 }
32 } 28 }
33 }, 29 },
30
31 _tween:{
32 value:[]
33 },
34
35 tween:{
36 serializable:true,
37 get:function () {
38 return this._tween;
39 },
40 set:function (newVal) {
41 this._tween = newVal;
42 }
43 },
44
34 _isVisible:{ 45 _isVisible:{
35 value: true 46 value: true
36 }, 47 },
@@ -337,15 +348,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
337 _positionCollapser:{ 348 _positionCollapser:{
338 value:null 349 value:null
339 }, 350 },
351 positionCollapser:{
352 serializable:true,
353 get:function(){
354 return this._positionCollapser;
355 },
356 set:function(val){
357 this._positionCollapser = val;
358 }
359 },
340 _mainCollapser:{ 360 _mainCollapser:{
341 value:null 361 value:null
342 }, 362 },
363 mainCollapser:{
364 serializable:true,
365 get:function () {
366 return this._mainCollapser;
367 },
368 set:function (val) {
369 this._mainCollapser = val;
370 }
371 },
343 _transformCollapser:{ 372 _transformCollapser:{
344 value:null 373 value:null
345 }, 374 },
375 transformCollapser:{
376 serializable:true,
377 get:function () {
378 return this._transformCollapser;
379 },
380 set:function (val) {
381 this._transformCollapser = val;
382 }
383 },
346 _styleCollapser:{ 384 _styleCollapser:{
347 value:null 385 value:null
348 }, 386 },
387 styleCollapser:{
388 serializable:true,
389 get:function () {
390 return this._styleCollapser;
391 },
392 set:function (val) {
393 this._styleCollapser = val;
394 }
395 },
349 396
350 _trackData:{ 397 _trackData:{
351 value: false 398 value: false