aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 16:02:23 -0700
committerValerio Virgillito2012-05-03 16:02:23 -0700
commit882f4f4b7427170ff3c3fc76a0ccd727c022bb63 (patch)
tree1efc021a187f12a50a44eedbe24a1c0355dfdafb /js/panels/Timeline/TimelinePanel.reel
parent59aaf2510ac1b0d7e8bf8732d33597deef5690fc (diff)
parenteb17fe1bbd05ad260e8a56918a3b396a03767e04 (diff)
downloadninja-882f4f4b7427170ff3c3fc76a0ccd727c022bb63.tar.gz
Merge branch 'refs/heads/master' into data-id
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html60
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js37
2 files changed, 44 insertions, 53 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index f10e9ac9..19709ca7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -151,29 +151,29 @@
151 </head> 151 </head>
152 <body> 152 <body>
153 153
154 <div id="timeline_panel" class="tl_container"> 154 <div data-montage-id="timeline_panel" class="tl_container">
155 155
156 <div id="bread_crumb"></div> 156 <div data-montage-id="bread_crumb"></div>
157 157
158 <div id="main_timeline" class="maintimeline"> 158 <div data-montage-id="main_timeline" class="maintimeline">
159 159
160 160
161 <div id="timeline_leftpane" class="tl_leftpane"> 161 <div data-montage-id="timeline_leftpane" class="tl_leftpane">
162 <div id="leftpane_inside" class="leftinside"> 162 <div data-montage-id="leftpane_inside" class="leftinside">
163 <div id="timeline_controller" class="timelinecontroller"> 163 <div data-montage-id="timeline_controller" class="timelinecontroller">
164 <div id="timeline_controls" class="timelinecontrols"> 164 <div data-montage-id="timeline_controls" class="timelinecontrols">
165 <div id="rewind_button" class="rewindbutton"></div> 165 <div data-montage-id="rewind_button" class="rewindbutton"></div>
166 <div id="play_button" class="playbutton"></div> 166 <div data-montage-id="play_button" class="playbutton"></div>
167 <div id="pause_button" class="pausebutton"></div> 167 <div data-montage-id="pause_button" class="pausebutton"></div>
168 <div id="forward_button" class="forwardbutton"></div> 168 <div data-montage-id="forward_button" class="forwardbutton"></div>
169 <div id="time_text" class="timetext">00:00:00</div> 169 <div data-montage-id="time_text" class="timetext">00:00:00</div>
170 </div> 170 </div>
171 </div> 171 </div>
172 172
173 173
174 174
175 <div id="user_layers" class="userlayers"> 175 <div data-montage-id="user_layers" class="userlayers">
176 <div id="master_layer" class="masterlayer"> 176 <div data-montage-id="master_layer" class="masterlayer">
177 <div class="layer-master">Master Layer 177 <div class="layer-master">Master Layer
178 <div class="tl-configbutton" data-montage-id="tl-configbutton"> 178 <div class="tl-configbutton" data-montage-id="tl-configbutton">
179 <div class="tl-dropdown"> 179 <div class="tl-dropdown">
@@ -187,36 +187,36 @@
187 </div> 187 </div>
188 188
189 </div> 189 </div>
190 <div id="container-layers" style="position: relative;" class="container-layers"> 190 <div data-montage-id="container-layers" style="position: relative;" class="container-layers">
191 <div id="container-layer"></div> 191 <div data-montage-id="container-layer"></div>
192 </div> 192 </div>
193 </div> 193 </div>
194 194
195 <div id="timeline_gutter" class="timelinegutter"> 195 <div data-montage-id="timeline_gutter" class="timelinegutter">
196 <div id="tl_slider" class="tl_slider"></div> 196 <div data-montage-id="tl_slider" class="tl_slider"></div>
197 <input id="end_hottext" class="endhottext"> 197 <input data-montage-id="end_hottext" class="endhottext">
198 </div> 198 </div>
199 </div> 199 </div>
200 </div> 200 </div>
201 201
202 <div data-montage-id="layer_resizer" class="layerresizer"></div> 202 <div data-montage-id="layer_resizer" class="layerresizer"></div>
203 203
204 <div id="timeline_rightpane" class="tl_rightpane"> 204 <div data-montage-id="timeline_rightpane" class="tl_rightpane">
205 <div id="right_inside" class="rightinside"> 205 <div data-montage-id="right_inside" class="rightinside">
206 <div class="layout_markers"> 206 <div class="layout_markers">
207 <div id="playhead" class="playhead"></div> 207 <div data-montage-id="playhead" class="playhead"></div>
208 <div id="timeline_markers" class="timelinemarkers"></div> 208 <div data-montage-id="timeline_markers" class="timelinemarkers"></div>
209 </div> 209 </div>
210 210
211 211
212 <div id="layer_tracks" class="tl_layertracks"> 212 <div data-montage-id="layer_tracks" class="tl_layertracks">
213 <div class="layout-tracks"> 213 <div class="layout-tracks">
214 <div id="playhead_marker" class="playheadmarker"></div> 214 <div data-montage-id="playhead_marker" class="playheadmarker"></div>
215 <div id="master_track" class="mastertrack"> 215 <div data-montage-id="master_track" class="mastertrack">
216 <div id="time_bar" class="timebar"></div> 216 <div data-montage-id="time_bar" class="timebar"></div>
217 </div> 217 </div>
218 <div id="container-tracks" class="container-tracks"> 218 <div data-montage-id="container-tracks" class="container-tracks">
219 <div id="container-track"></div> 219 <div data-montage-id="container-track"></div>
220 </div> 220 </div>
221 </div> 221 </div>
222 222
@@ -224,7 +224,7 @@
224 </div> 224 </div>
225 </div> 225 </div>
226 226
227 <div class="timeline-disabled" id="timeline-disabler"></div> 227 <div class="timeline-disabled" data-montage-id="timeline-disabler"></div>
228 228
229 </div> 229 </div>
230 </div> 230 </div>
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 70e04b4c..48818e44 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -16,7 +16,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
16 16
17 /* === BEGIN: Models === */ 17 /* === BEGIN: Models === */
18 _arrLayers:{ 18 _arrLayers:{
19 serializable:true,
20 value:[] 19 value:[]
21 }, 20 },
22 21
@@ -47,12 +46,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
47 46
48 47
49 _layerRepetition:{ 48 _layerRepetition:{
50 serializable:true,
51 value:null 49 value:null
52 }, 50 },
53 51
54 layerRepetition:{ 52 layerRepetition:{
55 serializable:true,
56 get:function () { 53 get:function () {
57 return this._layerRepetition; 54 return this._layerRepetition;
58 }, 55 },
@@ -170,7 +167,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
170 }, 167 },
171 168
172 _masterDuration:{ 169 _masterDuration:{
173 serializable:true,
174 value:0 170 value:0
175 }, 171 },
176 172
@@ -186,12 +182,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
186 }, 182 },
187 183
188 _trackRepetition:{ 184 _trackRepetition:{
189 serializable:true,
190 value:null 185 value:null
191 }, 186 },
192 187
193 trackRepetition:{ 188 trackRepetition:{
194 serializable:true,
195 get:function () { 189 get:function () {
196 return this._trackRepetition; 190 return this._trackRepetition;
197 }, 191 },
@@ -249,18 +243,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
249 }, 243 },
250 244
251 _firstTimeLoaded:{ 245 _firstTimeLoaded:{
252 value:true, 246 value:true
253 writable:true
254 }, 247 },
255 248
256 _captureSelection:{ 249 _captureSelection:{
257 value:false, 250 value:false
258 writable:true
259 }, 251 },
260 252
261 _openDoc:{ 253 _openDoc:{
262 value:false, 254 value:false
263 writable:true