diff options
author | Valerio Virgillito | 2012-07-18 11:45:54 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-18 11:45:54 -0700 |
commit | 2f009ea40ca815a9aff27a5862bba5a6b335586c (patch) | |
tree | 10a409394038c642c2aa811ba9a0ffaf667dfed7 /js/panels/Timeline/TimelinePanel.reel | |
parent | 9730dead250067abad10625c2da46cbd24fc0a1e (diff) | |
parent | ecc2f1c6296ac5e706b1d6388254c8df24a01066 (diff) | |
download | ninja-2f009ea40ca815a9aff27a5862bba5a6b335586c.tar.gz |
Merge branch 'refs/heads/master' into menu-fixes
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2831 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 115 | ||||
-rwxr-xr-x | js/panels/Timeline/TimelinePanel.reel/images/knob.png | bin | 0 -> 1036 bytes | |||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 27 |
5 files changed, 1517 insertions, 1458 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 6c5e030c..c287e68e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -217,7 +217,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
217 | </div> | 217 | </div> |
218 | 218 | ||
219 | <div data-montage-id="timeline_gutter" class="timelinegutter"> | 219 | <div data-montage-id="timeline_gutter" class="timelinegutter"> |
220 | <div class="sliderClass"> | ||
220 | <div data-montage-id="tl_slider" class="tl_slider"></div> | 221 | <div data-montage-id="tl_slider" class="tl_slider"></div> |
222 | </div> | ||
221 | <input data-montage-id="end_hottext" class="endhottext"> | 223 | <input data-montage-id="end_hottext" class="endhottext"> |
222 | </div> | 224 | </div> |
223 | </div> | 225 | </div> |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index a1e03b35..4e9771d4 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -30,109 +30,250 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | </copyright> */ | 30 | </copyright> */ |
31 | 31 | ||
32 | var Montage = require("montage/core/core").Montage, | 32 | var Montage = require("montage/core/core").Montage, |
33 | Component = require("montage/ui/component").Component, | 33 | Component = require("montage/ui/component").Component, |
34 | nj = require("js/lib/NJUtils").NJUtils, | 34 | nj = require("js/lib/NJUtils").NJUtils, |
35 | EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu; | 35 | EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu; |
36 | 36 | ||
37 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | 37 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { |
38 | 38 | ||
39 | /* === BEGIN: Models === */ | ||
40 | _user_layers: { | ||
41 | value: null | ||
42 | }, | ||
39 | user_layers: { | 43 | user_layers: { |
40 | value: null, | 44 | serializable: true, |
41 | serializable: true | 45 | get: function() { |
46 | return this._user_layers; | ||
47 | }, | ||
48 | set: function(newVal) { | ||
49 | this._user_layers = newVal; | ||
50 | } | ||
42 | }, | 51 | }, |
43 | 52 | ||
53 | _track_container: { | ||
54 | value: null | ||
55 | }, | ||
44 | track_container: { | 56 | track_container: { |
45 | value: null, | 57 | serializable: true, |
46 | serializable: true | 58 | get: function() { |
59 | return this._track_container; | ||
60 | }, | ||
61 | set: function(newVal) { | ||
62 | this._track_container = newVal; | ||
63 | } | ||
47 | }, | 64 | }, |
48 | 65 | ||
66 | _timeline_leftpane: { | ||
67 | value: null | ||
68 | }, | ||
49 | timeline_leftpane: { | 69 | timeline_leftpane: { |
50 | value: null, | 70 | serializable: true, |
51 | serializable: true | 71 | get: function() { |
72 | return this._timeline_leftpane; | ||
73 | }, | ||
74 | set: function(newVal) { | ||
75 | this._timeline_leftpane = newVal; | ||
76 | } | ||
52 | }, | 77 | }, |
53 | 78 | ||
79 | _layer_tracks: { | ||
80 | value: null | ||
81 | }, | ||
54 | layer_tracks: { | 82 | layer_tracks: { |
55 | value: null, | 83 | serializable: true, |
56 | serializable: true | 84 | get: function() { |
85 | return this._layer_tracks; | ||
86 | }, | ||
87 | set: function(newVal) { | ||
88 | this._layer_tracks = newVal; | ||
89 | } | ||
57 | }, | 90 | }, |
58 | 91 | ||
92 | _master_track: { | ||
93 | value: null | ||
94 | }, | ||
59 | master_track: { | 95 | master_track: { |
60 | value: null, | 96 | serializable: true, |
61 | serializable: true | 97 | get: function() { |
98 | return this._master_track; | ||
99 | }, | ||
100 | set: function(newVal) { | ||
101 | this._master_track = newVal; | ||
102 | } | ||
62 | }, | 103 | }, |
63 | 104 | ||
105 | _time_markers: { | ||
106 | value: null | ||
107 | }, | ||
64 | time_markers: { | 108 | time_markers: { |
65 | value: null, | 109 | serializable: true, |
66 | serializable: true | 110 | get: function() { |
111 | return this._time_markers; | ||
112 | }, | ||
113 | set: function(newVal) { | ||
114 | this._time_markers = newVal; | ||
115 | } | ||
67 | }, | 116 | }, |
68 | 117 | ||
118 | _playhead: { | ||
119 | value: null | ||
120 | }, | ||
69 | playhead: { | 121 | playhead: { |
70 | value: null, | 122 | serializable: true, |
71 | serializable: true | 123 | get: function() { |
124 | return this._playhead; | ||
125 | }, | ||
126 | set: function(newVal) { | ||
127 | this._playhead = newVal; | ||
128 | } | ||
72 | }, | 129 | }, |
73 | 130 | ||
131 | _playheadmarker: { | ||
132 | value: null | ||
133 | }, | ||
74 | playheadmarker: { | 134 | playheadmarker: { |
75 | value: null, | 135 | serializable: true, |
76 | serializable: true | 136 | get: function() { |
137 | return this._playheadmarker; | ||
138 | }, | ||
139 | set: function(newVal) { | ||
140 | this._playheadmarker = newVal; | ||
141 | } | ||
77 | }, | 142 | }, |
78 | 143 | ||
144 | _timetext: { | ||
145 | value: null | ||
146 | }, | ||
79 | timetext: { | 147 | timetext: { |
80 | value: null, | 148 | serializable: true, |
81 | serializable: true | 149 | get: function() { |
150 | return this._timetext; | ||
151 | }, | ||
152 | set: function(newVal) { | ||
153 | this._timetext = newVal; | ||
154 | } | ||
82 | }, | 155 | }, |
83 | 156 | ||
157 | _timebar: { | ||
158 | value: null | ||
159 | }, | ||
84 | timebar: { | 160 | timebar: { |
85 | value: null, | 161 | serializable: true, |
86 | serializable: true | 162 | get: function() { |
163 | return this._timebar; | ||
164 | }, | ||
165 | set: function(newVal) { | ||
166 | this._timebar = newVal; | ||
167 | } | ||
87 | }, | 168 | }, |
88 | 169 | ||
170 | _container_tracks: { | ||
171 | value: null | ||
172 | }, | ||
89 | container_tracks: { | 173 | container_tracks: { |
90 | value: null, | 174 | serializable: true, |
91 | serializable: true | 175 | get: function() { |
176 | return this._container_tracks; | ||
177 | }, | ||
178 | set: function(newVal) { | ||
179 | this._container_tracks = newVal; | ||
180 | } | ||
92 | }, | 181 | }, |
93 | 182 | ||
183 | _end_hottext: { | ||
184 | value: null | ||
185 | }, | ||