aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js122
1 files changed, 107 insertions, 15 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 6e9513f2..7af88662 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -10,10 +10,98 @@ var nj = require("js/lib/NJUtils").NJUtils;
10 10
11var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { 11var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
12 12
13 hasTemplate:{ 13 user_layers: {
14 value:true 14 value: null,
15 serializable: true
16 },
17
18 track_container: {
19 value: null,
20 serializable: true
21 },
22
23 timeline_leftpane: {
24 value: null,
25 serializable: true
26 },
27
28 layer_tracks: {
29 value: null,
30 serializable: true
31 },
32
33 master_track: {
34 value: null,
35 serializable: true
36 },
37
38 time_markers: {
39 value: null,
40 serializable: true
41 },
42
43 playhead: {
44 value: null,
45 serializable: true
46 },
47
48 playheadmarker: {
49 value: null,
50 serializable: true
51 },
52
53 timetext: {
54 value: null,
55 serializable: true
56 },
57
58 timebar: {
59 value: null,
60 serializable: true
61 },
62
63 container_tracks: {
64 value: null,
65 serializable: true
15 }, 66 },
16 67
68 end_hottext: {
69 value: null,
70 serializable: true
71 },
72
73 container_layers: {
74 value: null,
75 serializable: true
76 },
77
78 timeline_disabler: {
79 value: null,
80 serializable: true
81 },
82
83 checkable_relative: {
84 value: null,
85 serializable: true
86 },
87
88 checkable_absolute: {
89 value: null,
90 serializable: true
91 },
92
93 checkable_animated: {
94 value: null,
95 serializable: true
96 },
97
98 tl_configbutton: {
99 value: null,
100 serializable: true
101 },
102
103
104
17 /* === BEGIN: Models === */ 105 /* === BEGIN: Models === */
18 _currentDocument: { 106 _currentDocument: {
19 value : null 107 value : null
@@ -90,7 +178,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
90 }, 178 },
91 set:function (newVal) { 179 set:function (newVal) {
92 this._layerRepetition = newVal; 180 this._layerRepetition = newVal;
93 } 181 },
182 serializable: true
94 }, 183 },
95 184
96 // Set to false to skip array caching array sets in current document 185 // Set to false to skip array caching array sets in current document
@@ -234,7 +323,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
234 }, 323 },
235 set:function (newVal) { 324 set:function (newVal) {
236 this._trackRepetition = newVal; 325 this._trackRepetition = newVal;
237 } 326 },
327 serializable: true
238 }, 328 },
239 329
240 _selectedKeyframes:{ 330 _selectedKeyframes:{
@@ -488,11 +578,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
488 // Store the timeline data in currentDocument... 578 // Store the timeline data in currentDocument...
489 if (this._boolCacheArrays) { 579 if (this._boolCacheArrays) {
490 // ... but only if we're supposed to. 580 // ... but only if we're supposed to.
491 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; 581 if(this.currentDocument) {
492 this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer; 582 this.currentDocument.tlArrLayers = this.arrLayers;
493 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; 583 this.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer;
494 this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected; 584 this.currentDocument.tllayerNumber = this.currentLayerNumber;
495 this.application.ninja.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected; 585 this.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected;
586 this.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected;
587 }
496 } 588 }
497 } 589 }
498 }, 590 },
@@ -500,12 +592,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
500 initTimelineCache: { 592 initTimelineCache: {
501 value: function() { 593 value: function() {
502 // Initialize the currentDocument for a new set of timeline data. 594 // Initialize the currentDocument for a new set of timeline data.
503 this.application.ninja.currentDocument.isTimelineInitialized = true; 595 this.currentDocument.isTimelineInitialized = true;
504 this.application.ninja.currentDocument.tlArrLayers = []; 596 this.currentDocument.tlArrLayers = [];
505 this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer; 597 this.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer;
506 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; 598 this.currentDocument.tllayerNumber = this.currentLayerNumber;
507 this.application.ninja.currentDocument.tlCurrentLayerSelected = false; 599 this.currentDocument.tlCurrentLayerSelected = false;
508 this.application.ninja.currentDocument.tlCurrentLayersSelected = false; 600 this.currentDocument.tlCurrentLayersSelected = false;
509 } 601 }
510 }, 602 },
511 603