diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 4ff28fd4..2c98233c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -97,22 +97,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
97 | } | 97 | } |
98 | }, | 98 | }, |
99 | 99 | ||
100 | _arrTracks:{ | ||
101 | serializable:true, | ||
102 | value:[] | ||
103 | }, | ||
104 | |||
105 | arrTracks:{ | ||
106 | serializable:true, | ||
107 | get:function () { | ||
108 | return this._arrTracks; | ||
109 | }, | ||
110 | set:function (newVal) { | ||
111 | this._arrTracks = newVal; | ||
112 | this._cacheArrays(); | ||
113 | } | ||
114 | }, | ||
115 | |||
116 | _trackRepetition:{ | 100 | _trackRepetition:{ |
117 | serializable:true, | 101 | serializable:true, |
118 | value:null | 102 | value:null |
@@ -284,23 +268,20 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
284 | _firstLayerDraw = true; | 268 | _firstLayerDraw = true; |
285 | 269 | ||
286 | // After recreating the tracks and layers, store the result in the currentDocument. | 270 | // After recreating the tracks and layers, store the result in the currentDocument. |
287 | this.application.ninja.currentDocument.tlArrTracks = this.arrTracks; | ||
288 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; | 271 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; |
289 | 272 | ||
290 | } else { | 273 | } else { |
291 | // we do have information stored. Use it. | 274 | // we do have information stored. Use it. |
292 | this._boolCacheArrays = false; | 275 | this._boolCacheArrays = false; |
293 | this.arrLayers = []; | 276 | //this.arrLayers = []; |
294 | this.arrTracks = []; | ||
295 | this.arrLayers = this.application.ninja.currentDocument.tlArrLayers; | 277 | this.arrLayers = this.application.ninja.currentDocument.tlArrLayers; |
296 | this.arrTracks = this.application.ninja.currentDocument.tlArrTracks; | ||
297 | this._boolCacheArrays = true; | 278 | this._boolCacheArrays = true; |
298 | } | 279 | } |
299 | 280 | ||
300 | // Redraw all the things | 281 | // Redraw all the things |
301 | this.layerRepetition.needsDraw = true; | 282 | //this.layerRepetition.needsDraw = true; |
302 | this.trackRepetition.needsDraw = true; | 283 | //this.trackRepetition.needsDraw = true; |
303 | this.needsDraw = true; | 284 | //this.needsDraw = true; |
304 | } | 285 | } |
305 | }, | 286 | }, |
306 | 287 | ||
@@ -323,7 +304,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
323 | this.hashTrackInstance = null; | 304 | this.hashTrackInstance = null; |
324 | this.hashLayerNumber = null; | 305 | this.hashLayerNumber = null; |
325 | this.hashElementMapToLayer = null; | 306 | this.hashElementMapToLayer = null; |
326 | this.arrTracks = []; | ||
327 | this.arrLayers = []; | 307 | this.arrLayers = []; |
328 | 308 | ||
329 | this.currentLayerNumber = 0; | 309 | this.currentLayerNumber = 0; |
@@ -471,7 +451,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
471 | this._firstTimeLoaded = false; | 451 | this._firstTimeLoaded = false; |
472 | } else { | 452 | } else { |
473 | this.arrLayers.length = 0; | 453 | this.arrLayers.length = 0; |
474 | this.arrTracks.length = 0; | ||
475 | 454 | ||
476 | if (event.detail.element.id === "UserContent") { | 455 | if (event.detail.element.id === "UserContent") { |
477 | this._hashKey = "123"; | 456 | this._hashKey = "123"; |
@@ -578,6 +557,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
578 | newLayerName = "Layer " + this.currentLayerNumber; | 557 | newLayerName = "Layer " + this.currentLayerNumber; |
579 | thingToPush.layerName = newLayerName; | 558 | thingToPush.layerName = newLayerName; |
580 | thingToPush.layerID = this.currentLayerNumber; | 559 | thingToPush.layerID = this.currentLayerNumber; |
560 | thingToPush.bypassAnimation = false; | ||
581 | thingToPush.isMainCollapsed = true; | 561 | thingToPush.isMainCollapsed = true; |
582 | thingToPush.isPositionCollapsed = true; | 562 | thingToPush.isPositionCollapsed = true; |
583 | thingToPush.isTransformCollapsed = true; | 563 | thingToPush.isTransformCollapsed = true; |