diff options
author | Jonathan Duran | 2012-04-06 08:46:42 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-06 08:46:42 -0700 |
commit | 852f49888e54b4a2a8ee929dbeb0c54dfa004de6 (patch) | |
tree | d90b53a70e0c14992db62fc0705b830f75cec52e /js/panels/Timeline/TimelineTrack.reel | |
parent | 921a106cc1159b93068a4c635fcc0c74084446a5 (diff) | |
parent | eb694fa5d39733264bce7ba832aabbe9c3d6c81e (diff) | |
download | ninja-852f49888e54b4a2a8ee929dbeb0c54dfa004de6.tar.gz |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index edca4306..8b639758 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -42,10 +42,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
42 | return this._isMainCollapsed; | 42 | return this._isMainCollapsed; |
43 | }, | 43 | }, |
44 | set:function (newVal) { | 44 | set:function (newVal) { |
45 | if (newVal !== this._isMainCollapsed) { | 45 | this._isMainCollapsed = newVal; |
46 | this._isMainCollapsed = newVal; | 46 | this.trackData.isMainCollapsed = newVal; |
47 | this.trackData.isMainCollapsed = newVal; | ||
48 | } | ||
49 | } | 47 | } |
50 | }, | 48 | }, |
51 | _isTransformCollapsed:{ | 49 | _isTransformCollapsed:{ |
@@ -56,10 +54,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
56 | return this._isTransformCollapsed; | 54 | return this._isTransformCollapsed; |
57 | }, | 55 | }, |
58 | set:function (newVal) { | 56 | set:function (newVal) { |
59 | if (newVal !== this._isTransformCollapsed) { | 57 | this._isTransformCollapsed = newVal; |
60 | this._isTransformCollapsed = newVal; | 58 | this.trackData.isTransformCollapsed = newVal; |
61 | this.trackData.isTransformCollapsed = newVal; | ||
62 | } | ||
63 | } | 59 | } |
64 | }, | 60 | }, |
65 | _isPositionCollapsed:{ | 61 | _isPositionCollapsed:{ |
@@ -70,10 +66,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
70 | return this._isPositionCollapsed; | 66 | return this._isPositionCollapsed; |
71 | }, | 67 | }, |
72 | set:function (newVal) { | 68 | set:function (newVal) { |
73 | if (newVal !== this._isPositionCollapsed) { | 69 | this._isPositionCollapsed = newVal; |
74 | this._isPositionCollapsed = newVal; | 70 | this.trackData.isPositionCollapsed = newVal; |
75 | this.trackData.isPositionCollapsed = newVal; | ||
76 | } | ||
77 | } | 71 | } |
78 | }, | 72 | }, |
79 | _isStyleCollapsed:{ | 73 | _isStyleCollapsed:{ |
@@ -84,10 +78,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
84 | return this._isStyleCollapsed; | 78 | return this._isStyleCollapsed; |
85 | }, | 79 | }, |
86 | set:function (newVal) { | 80 | set:function (newVal) { |
87 | if (newVal !== this._isStyleCollapsed) { | 81 | this._isStyleCollapsed = newVal; |
88 | this._isStyleCollapsed = newVal; | 82 | this.trackData.isStyleCollapsed = newVal; |
89 | this.trackData.isStyleCollapsed = newVal; | ||
90 | } | ||
91 | } | 83 | } |
92 | }, | 84 | }, |
93 | _bypassAnimation : { | 85 | _bypassAnimation : { |
@@ -100,7 +92,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
100 | return this._bypassAnimation; | 92 | return this._bypassAnimation; |
101 | }, | 93 | }, |
102 | set: function(newVal) { | 94 | set: function(newVal) { |
103 | if ((newVal !== this._bypassAnimation) && (typeof(this.trackData) !== "undefined")) { | 95 | if (typeof(this.trackData) !== "undefined") { |
104 | this._bypassAnimation = newVal; | 96 | this._bypassAnimation = newVal; |
105 | this.trackData.bypassAnimation = newVal; | 97 | this.trackData.bypassAnimation = newVal; |
106 | } | 98 | } |