aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js34
-rw-r--r--js/panels/Timeline/Style.reel/Style.js30
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js131
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html1
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js28
-rw-r--r--js/panels/Timeline/Track.reel/Track.js5
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js10
7 files changed, 215 insertions, 24 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index aa900b0c..4941ff79 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -16,8 +16,34 @@ var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
16 16
17var Layer = exports.Layer = Montage.create(Component, { 17var Layer = exports.Layer = Montage.create(Component, {
18 18
19 hasTemplate:{ 19 dynamicLayerTag: {
20 value: true 20 value: null,
21 serializable: true
22 },
23
24 positionCollapser: {
25 value: null,
26 serializable: true
27 },
28
29 transformCollapser: {
30 value: null,
31 serializable: true
32 },
33
34 styleCollapser: {
35 value: null,
36 serializable: true
37 },
38
39 clickerMain: {
40 value: null,
41 serializable: true
42 },
43
44 myLabel: {
45 value: null,
46 serializable: true
21 }, 47 },
22 48
23 /* Begin: Models */ 49 /* Begin: Models */
@@ -32,7 +58,8 @@ var Layer = exports.Layer = Montage.create(Component, {
32 }, 58 },
33 set: function(newVal) { 59 set: function(newVal) {
34 this._mainCollapser = newVal; 60 this._mainCollapser = newVal;
35 } 61 },
62 serializable: true
36 }, 63 },
37 64
38 /* Style models: the array of styles, and the repetition that uses them */ 65 /* Style models: the array of styles, and the repetition that uses them */
@@ -431,6 +458,7 @@ var Layer = exports.Layer = Montage.create(Component, {
431 }, 458 },
432 459
433 layerData:{ 460 layerData:{
461 serializable: true,
434 get:function(){ 462 get:function(){
435 return this._layerData; 463 return this._layerData;
436 }, 464 },
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 03d674a5..fe8d04e9 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -22,10 +22,31 @@ var ElementsMediator = require("js/mediators/element-mediator").ElementMediato
22 22
23var LayerStyle = exports.LayerStyle = Montage.create(Component, { 23var LayerStyle = exports.LayerStyle = Montage.create(Component, {
24 24
25 hasTemplate:{ 25 styleContainer: {
26 value: true 26 value: null,
27 serializable: true
27 }, 28 },
28 29
30 styleHintable: {
31 value: null,
32 serializable: true
33 },
34
35 styleProperty: {
36 value: null,
37 serializable: true
38 },
39
40 valueEditorHottext: {
41 value: null,
42 serializable: true
43 },
44
45 dtextProperty: {
46 value: null,
47 serializable: true
48 },
49
29 /* === BEGIN: Models === */ 50 /* === BEGIN: Models === */
30 // isSelected: whether or not the style is selected 51 // isSelected: whether or not the style is selected
31 _isSelected: { 52 _isSelected: {
@@ -115,7 +136,8 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
115 }, 136 },
116 set: function(newVal) { 137 set: function(newVal) {
117 this._myHintable = newVal; 138 this._myHintable = newVal;
118 } 139 },
140 serializable: true
119 }, 141 },
120 _myHintableValue : { 142 _myHintableValue : {
121 value: null 143 value: null
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 509ec7b1..734b051f 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -11,10 +11,98 @@ var Montage = require("montage/core/core").Montage,
11 11
12var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { 12var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
13 13
14 hasTemplate:{ 14 user_layers: {
15 value:true 15 value: null,
16 serializable: true
17 },
18
19 track_container: {
20 value: null,
21 serializable: true
22 },
23
24 timeline_leftpane: {
25 value: null,
26 serializable: true
27 },
28
29 layer_tracks: {
30 value: null,
31 serializable: true
32 },
33
34 master_track: {
35 value: null,
36 serializable: true
37 },
38
39 time_markers: {
40 value: null,
41 serializable: true
42 },
43
44 playhead: {
45 value: null,
46 serializable: true
47 },
48
49 playheadmarker: {
50 value: null,
51 serializable: true
52 },
53
54 timetext: {
55 value: null,
56 serializable: true
57 },
58
59 timebar: {
60 value: null,
61 serializable: true
62 },
63
64 container_tracks: {
65 value: null,
66 serializable: true
67 },
68
69 end_hottext: {
70 value: null,
71 serializable: true
72 },
73
74 container_layers: {
75 value: null,
76 serializable: true
77 },
78
79 timeline_disabler: {
80 value: null,
81 serializable: true
82 },
83
84 checkable_relative: {
85 value: null,
86 serializable: true
87 },
88
89 checkable_absolute: {
90 value: null,
91 serializable: true
92 },
93
94 checkable_animated: {
95 value: null,
96 serializable: true
16 }, 97 },
17 98
99 tl_configbutton: {
100 value: null,
101 serializable: true
102 },
103
104
105
18 /* === BEGIN: Models === */ 106 /* === BEGIN: Models === */
19 _currentDocument: { 107 _currentDocument: {
20 value : null 108 value : null
@@ -54,6 +142,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
54 } 142 }
55 } 143 }
56 }, 144 },
145