diff options
author | Jonathan Duran | 2012-02-23 08:08:30 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-23 08:08:30 -0800 |
commit | cf671b4855ecca0278128e82459691292a3d3dc9 (patch) | |
tree | 13a93345dc2427a0403c94ced3dfd5093d146310 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
parent | a712e134ea94b6a21061c1bd272ce15b1f95b986 (diff) | |
download | ninja-cf671b4855ecca0278128e82459691292a3d3dc9.tar.gz |
Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTrack component.
Cherry pick commit from jreid/Timeline-jreid
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 1c33a040..de2c75c7 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -114,6 +114,71 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
114 | this.needsDraw = true; | 114 | this.needsDraw = true; |
115 | } | 115 | } |
116 | }, | 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 : { | ||
153 | serializable: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 | }, | ||
117 | 182 | ||
118 | _tweens:{ | 183 | _tweens:{ |
119 | enumerable: false, | 184 | enumerable: false, |
@@ -414,6 +479,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
414 | init:{ | 479 | init:{ |
415 | value:function () { | 480 | value:function () { |
416 | var that = this; | 481 | var that = this; |
482 | |||
483 | this.arrPositionTracks = [0, 1, 2]; | ||
484 | this.arrTransformTracks = [0, 1, 2, 3, 4]; | ||
485 | |||
417 | this.label = this.element.querySelector(".label-main"); | 486 | this.label = this.element.querySelector(".label-main"); |
418 | this.myContent = this.element.querySelector(".content-main"); | 487 | this.myContent = this.element.querySelector(".content-main"); |
419 | this.labelPosition = this.element.querySelector(".label-position"); | 488 | this.labelPosition = this.element.querySelector(".label-position"); |