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 d7329ac7..22991a82 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
@@ -125,7 +213,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
125 }, 213 },
126 set:function (newVal) { 214 set:function (newVal) {
127 this._layerRepetition = newVal; 215 this._layerRepetition = newVal;
128 } 216 },
217 serializable: true
129 }, 218 },
130 219
131 // Set to false to skip array caching array sets in current document 220 // Set to false to skip array caching array sets in current document
@@ -249,7 +338,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
249 }, 338 },
250 set:function (newVal) { 339 set:function (newVal) {
251 this._trackRepetition = newVal; 340 this._trackRepetition = newVal;
252 } 341 },
342 serializable: true
253 }, 343 },
254 344
255 _selectedKeyframes:{ 345 _selectedKeyframes:{
@@ -511,11 +601,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
511 // Store the timeline data in currentDocument... 601 // Store the timeline data in currentDocument...
512 if (this._boolCacheArrays) { 602 if (this._boolCacheArrays) {
513 // ... but only if we're supposed to. 603 // ... but only if we're supposed to.
514 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; 604 if(this.currentDocument) {
515 this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer; 605 this.currentDocument.tlArrLayers = this.arrLayers;
516 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; 606 this.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer;
517 this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected; 607 this.currentDocument.tllayerNumber = this.currentLayerNumber;
518 this.application.ninja.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected; 608 this.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected;
609 this.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected;
610 }
519 } 611 }
520 } 612 }
521 }, 613 },
@@ -523,12 +615,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
523 initTimelineCache: { 615 initTimelineCache: {
524 value: function() { 616 value: function() {
525 // Initialize the currentDocument for a new set of timeline data. 617 // Initialize the currentDocument for a new set of timeline data.
526 this.application.ninja.currentDocument.isTimelineInitialized = true; 618 this.currentDocument.isTimelineInitialized = true;
527 this.application.ninja.currentDocument.tlArrLayers = []; 619 this.currentDocument.tlArrLayers = [];
528 this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer; 620 this.currentDocument.tlCurrentSelectedContainer = this.application.ninja.currentSelectedContainer;
529 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; 621 this.currentDocument.tllayerNumber = this.currentLayerNumber;
530 this.application.ninja.currentDocument.tlCurrentLayerSelected = false; 622 this.currentDocument.tlCurrentLayerSelected = false;
531 this.application.ninja.currentDocument.tlCurrentLayersSelected = false; 623 this.currentDocument.tlCurrentLayersSelected = false;
532 } 624 }
533 }, 625 },
534 626