diff options
author | Jon Reid | 2012-07-03 15:47:50 -0700 |
---|---|---|
committer | Jon Reid | 2012-07-03 15:47:50 -0700 |
commit | 8c087f7c13a2bd72e1640e99e339a74fc2250901 (patch) | |
tree | 1e69a65489e240bb7eab3a857c4acd7429f54f79 | |
parent | 539f430f95812e726ad14012965ece942a010bca (diff) | |
download | ninja-8c087f7c13a2bd72e1640e99e339a74fc2250901.tar.gz |
Timeline: First pass at cleaning up TimelineTrack code. Changes propagated
to PropertyTrack, TimelineTrack, and Tween classes.
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 4 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 1124 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 7 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 4 |
4 files changed, 566 insertions, 573 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index c4571e9d..5c674c27 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
@@ -244,7 +244,9 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
244 | insertPropTween:{ | 244 | insertPropTween:{ |
245 | value:function(clickPos){ | 245 | value:function(clickPos){ |
246 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 246 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
247 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | 247 | // this.application.ninja.timeline.selectLayer(selectedIndex, true); // Deprecated. |
248 | this.application.ninja.timeline.selectLayers([selectedIndex]); | ||
249 | this.application.ninja.timeline.updateStageSelection(); | ||
248 | 250 | ||
249 | var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); | 251 | var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); |
250 | var currentMillisec = currentMillisecPerPixel * clickPos; | 252 | var currentMillisec = currentMillisecPerPixel * clickPos; |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 1df37636..17372935 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -11,103 +11,244 @@ var Montage = require("montage/core/core").Montage, | |||
11 | 11 | ||
12 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | 12 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { |
13 | 13 | ||
14 | /* === BEGIN: Models === */ | ||
15 | _user_layers: { | ||
16 | value: null | ||
17 | }, | ||
14 | user_layers: { | 18 | user_layers: { |
15 | value: null, | 19 | serializable: true, |
16 | serializable: true | 20 | get: function() { |
21 | return this._user_layers; | ||
22 | }, | ||
23 | set: function(newVal) { | ||
24 | this._user_layers = newVal; | ||
25 | } | ||
17 | }, | 26 | }, |
18 | 27 | ||
28 | _track_container: { | ||
29 | value: null | ||
30 | }, | ||
19 | track_container: { | 31 | track_container: { |
20 | value: null, | 32 | serializable: true, |
21 | serializable: true | 33 | get: function() { |
34 | return this._track_container; | ||
35 | }, | ||
36 | set: function(newVal) { | ||
37 | this._track_container = newVal; | ||
38 | } | ||
22 | }, | 39 | }, |
23 | 40 | ||
41 | _timeline_leftpane: { | ||
42 | value: null | ||
43 | }, | ||
24 | timeline_leftpane: { | 44 | timeline_leftpane: { |
25 | value: null, | 45 | serializable: true, |
26 | serializable: true | 46 | get: function() { |
47 | return this._timeline_leftpane; | ||
48 | }, | ||
49 | set: function(newVal) { | ||
50 | this._timeline_leftpane = newVal; | ||
51 | } | ||
27 | }, | 52 | }, |
28 | 53 | ||
54 | _layer_tracks: { | ||
55 | value: null | ||
56 | }, | ||
29 | layer_tracks: { | 57 | layer_tracks: { |
30 | value: null, | 58 | serializable: true, |
31 | serializable: true | 59 | get: function() { |
60 | return this._layer_tracks; | ||
61 | }, | ||
62 | set: function(newVal) { | ||
63 | this._layer_tracks = newVal; | ||
64 | } | ||
32 | }, | 65 | }, |
33 | 66 | ||
67 | _master_track: { | ||
68 | value: null | ||
69 | }, | ||
34 | master_track: { | 70 | master_track: { |
35 | value: null, | 71 | serializable: true, |
36 | serializable: true | 72 | get: function() { |
73 | return this._master_track; | ||
74 | }, | ||
75 | set: function(newVal) { | ||
76 | this._master_track = newVal; | ||
77 | } | ||
37 | }, | 78 | }, |
38 | 79 | ||
80 | _time_markers: { | ||
81 | value: null | ||
82 | }, | ||
39 | time_markers: { | 83 | time_markers: { |
40 | value: null, | 84 | serializable: true, |
41 | serializable: true | 85 | get: function() { |
86 | return this._time_markers; | ||
87 | }, | ||
88 | set: function(newVal) { | ||
89 | this._time_markers = newVal; | ||
90 | } | ||
42 | }, | 91 | }, |
43 | 92 | ||
93 | _playhead: { | ||
94 | value: null | ||
95 | }, | ||
44 | playhead: { | 96 | playhead: { |
45 | value: null, | 97 | serializable: true, |
46 | serializable: true | 98 | get: function() { |
99 | return this._playhead; | ||
100 | }, | ||
101 | set: function(newVal) { | ||
102 | this._playhead = newVal; | ||
103 | } | ||
47 | }, | 104 | }, |
48 | 105 | ||
106 | _playheadmarker: { | ||
107 | value: null | ||
108 | }, | ||
49 | playheadmarker: { | 109 | playheadmarker: { |
50 | value: null, | 110 | serializable: true, |
51 | serializable: true | 111 | get: function() { |
112 | return this._playheadmarker; | ||
113 | }, | ||
114 | set: function(newVal) { | ||
115 | this._playheadmarker = newVal; | ||
116 | } | ||
52 | }, | 117 | }, |
53 | 118 | ||
119 | _timetext: { | ||
120 | value: null | ||
121 | }, | ||
54 | timetext: { | 122 | timetext: { |
55 | value: null, | 123 | serializable: true, |
56 | serializable: true | 124 | get: function() { |
125 | return this._timetext; | ||
126 | }, | ||
127 | set: function(newVal) { | ||
128 | this._timetext = newVal; | ||
129 | } | ||
57 | }, | 130 | }, |
58 | 131 | ||
132 | _timebar: { | ||
133 | value: null | ||
134 | }, | ||
59 | timebar: { | 135 | timebar: { |
60 | value: null, | 136 | serializable: true, |
61 | serializable: true | 137 | get: function() { |
138 | return this._timebar; | ||
139 | }, | ||
140 | set: function(newVal) { | ||
141 | this._timebar = newVal; | ||
142 | } | ||
62 | }, | 143 | }, |
63 | 144 | ||
145 | _container_tracks: { | ||
146 | value: null | ||
147 | }, | ||
64 | container_tracks: { | 148 | container_tracks: { |
65 | value: null, | 149 | serializable: true, |
66 | serializable: true | 150 | get: function() { |
151 | return this._container_tracks; | ||
152 | }, | ||
153 | set: function(newVal) { | ||
154 | this._container_tracks = newVal; | ||
155 | } | ||
67 | }, | 156 | }, |
68 | 157 | ||
158 | _end_hottext: { | ||
159 | value: null | ||
160 | }, | ||
69 | end_hottext: { | 161 | end_hottext: { |
70 | value: null, | 162 | serializable: true, |
71 | serializable: true | 163 | get: function() { |
164 | return this._end_hottext; | ||
165 | }, | ||
166 | set: function(newVal) { | ||
167 | this._end_hottext = newVal; | ||
168 | } | ||
72 | }, | 169 | }, |
73 | 170 | ||
171 | _container_layers: { | ||
172 | value: null | ||
173 | }, | ||
74 | container_layers: { | 174 | container_layers: { |
75 |