aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html42
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js192
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css65
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss18
4 files changed, 188 insertions, 129 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index b0d191c2..4808e4d8 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -11,7 +11,8 @@
11 "properties": { 11 "properties": {
12 "element": {"#": "track"}, 12 "element": {"#": "track"},
13 "tweenRepetition" : {"@" : "tweenRepetition"}, 13 "tweenRepetition" : {"@" : "tweenRepetition"},
14 "track_lane": {"#": "track_lanes"} 14 "styleTracksRepetition" : {"@" : "styleTracksRepetition"},
15 "tween": {"@" : "tween"}
15 } 16 }
16 }, 17 },
17 18
@@ -37,19 +38,24 @@
37 "boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition", 38 "boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition",
38 "oneway" : false 39 "oneway" : false
39 }, 40 },
40 "timelineTrack" : { 41 "keyFrameMillisec" : {
41 "boundObject" : {"@": "tweenRepetition"}, 42 "boundObject" : {"@": "tweenRepetition"},
42 "boundObjectPropertyPath" : "objectAtCurrentIteration.timelineTrack", 43 "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec",
43 "oneway" : false 44 "oneway" : false
44 }, 45 },
45 "keyFrameMillisec" : { 46 "tweenID" : {
46 "boundObject" : {"@": "tweenRepetition"}, 47 "boundObject" : {"@": "tweenRepetition"},
47 "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec", 48 "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenID",
48 "oneway" : false 49 "oneway" : false
49 }, 50 },
50 "keyframeID" : { 51 "tweenedProperties" : {
51 "boundObject" : {"@": "tweenRepetition"}, 52 "boundObject" : {"@": "tweenRepetition"},
52 "boundObjectPropertyPath" : "objectAtCurrentIteration.keyframeID", 53 "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenedProperties",
54 "oneway" : false
55 },
56 "isTweenAnimated" : {
57 "boundObject" : {"@": "tweenRepetition"},
58 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated",
53 "oneway" : false 59 "oneway" : false
54 } 60 }
55 } 61 }
@@ -69,7 +75,25 @@
69 "oneway": false 75 "oneway": false
70 } 76 }
71 } 77 }
78 },
79
80 "styleTrackRepetition": {
81 "module": "montage/ui/repetition.reel",
82 "name": "Repetition",
83 "properties": {
84 "element": {"#": "content-styles"},
85 "isSelectionEnabled" : false
86 },
87 "bindings": {
88 "objects": {
89 "boundObject": {"@": "owner"},
90 "boundObjectPropertyPath": "arrStyleTracks",
91 "oneway": false
92 }
93 }
72 } 94 }
95
96
73 } 97 }
74 </script> 98 </script>
75 </head> 99 </head>
@@ -102,8 +126,8 @@
102 <div class="label-styles collapsible-label collapsible-collapsed"> 126 <div class="label-styles collapsible-label collapsible-collapsed">
103 127
104 </div> 128 </div>
105 <div class="content-styles collapsible-content collapsible-collapsed"> 129 <div id="content-styles" class="content-styles collapsible-content collapsible-collapsed">
106 130 <div class="timeline-track"></div>
107 </div> 131 </div>
108 </div> 132 </div>
109 </div> 133 </div>
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 62688825..1c33a040 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -10,10 +10,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
10 }, 10 },
11 11
12 _trackID:{ 12 _trackID:{
13 value:null,
14 writable:true,
15 serializable:true, 13 serializable:true,
16 enumerable:true 14 value:null
17 }, 15 },
18 16
19 trackID:{ 17 trackID:{
@@ -85,21 +83,50 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
85 } 83 }
86 } 84 }
87 }, 85 },
88 86
89 _tweens:{ 87 _arrStyleTracks : {
90 serializable:true, 88 serializable:true,
91 enumerable:true, 89 enumerable:true,
90 value: []
91 },
92 arrStyleTracks: {
93 serializable:true,
94 enumerable:true,
95 get: function() {
96 return this._arrStyleTracks;
97 },
98 set: function(newVal) {
99 this._arrStyleTracks = newVal;
100 this.needsDraw = true;
101 }
102 },
103 _styleTracksRepetition: {
104 serializable: true,
105 value: null
106 },
107 styleTracksRepetition : {
108 serializable: true,
109 get: function() {
110 return this._styleTracksRepetition;
111 },
112 set: function(newVal) {
113 this._styleTracksRepetition = newVal;
114 this.needsDraw = true;
115 }
116 },
117
118 _tweens:{
119 enumerable: false,
92 value:[] 120 value:[]
93 }, 121 },
94 122
95 tweens:{ 123 tweens:{
96 serializable:true, 124 serializable:true,
97 enumerable:true,
98 get:function () { 125 get:function () {
99 return this._spans; 126 return this._tweens;
100 }, 127 },
101 set:function (newVal) { 128 set:function (newVal) {
102 this._spans = newVal; 129 this._tweens = newVal;
103 } 130 }
104 }, 131 },
105 132
@@ -118,14 +145,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
118 } 145 }
119 }, 146 },
120 147
148 _trackDuration:{
149 serializable: true,
150 value:0
151 },
152
121 trackDuration:{ 153 trackDuration:{
154 serializable:true,
155 get:function () {
156 return this._trackDuration;
157 },
158 set:function (val) {
159 this._trackDuration = val;
160 }
161 },
162
163 _trackPosition:{
164 serializable:true,
122 value:0 165 value:0
123 }, 166 },
124 167
125 currentKeyframeRule:{ 168 trackPosition:{
169 serializable:true,
170 get:function () {
171 return this._trackPosition;
172 },
173 set:function (val) {