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.html2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js185
2 files changed, 138 insertions, 49 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 7e9b8a21..2d508b3c 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -200,7 +200,7 @@
200 "properties" : { 200 "properties" : {
201 "element" : {"#" : "content-styles"}, 201 "element" : {"#" : "content-styles"},
202 "myContent" : {"#":"content-styles"}, 202 "myContent" : {"#":"content-styles"},
203 "contentHeight" : 40, 203 "contentHeight" : 0,
204 "isLabelClickable" : false, 204 "isLabelClickable" : false,
205 "clicker" : {"#" : "label-styles"}, 205 "clicker" : {"#" : "label-styles"},
206 "isCollapsed" : true, 206 "isCollapsed" : true,
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index c6b67c9c..edca4306 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -26,8 +26,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
26 return this._trackID; 26 return this._trackID;
27 }, 27 },
28 set:function (value) { 28 set:function (value) {
29 this._trackID = value; 29 if (value !== this._trackID) {
30 //this.needsDraw = true; 30 this._trackID = value;
31 this.trackData.layerID = value;
32 }
31 } 33 }
32 }, 34 },
33 35
@@ -40,11 +42,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
40 return this._isMainCollapsed; 42 return this._isMainCollapsed;
41 }, 43 },
42 set:function (newVal) { 44 set:function (newVal) {
43 this.log('TimelineTrack.js: isMainCollapsed: ', newVal);
44 if (newVal !== this._isMainCollapsed) { 45 if (newVal !== this._isMainCollapsed) {
45 this._isMainCollapsed = newVal; 46 this._isMainCollapsed = newVal;
47 this.trackData.isMainCollapsed = newVal;
46 } 48 }
47
48 } 49 }
49 }, 50 },
50 _isTransformCollapsed:{ 51 _isTransformCollapsed:{
@@ -57,6 +58,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
57 set:function (newVal) { 58 set:function (newVal) {
58 if (newVal !== this._isTransformCollapsed) { 59 if (newVal !== this._isTransformCollapsed) {
59 this._isTransformCollapsed = newVal; 60 this._isTransformCollapsed = newVal;
61 this.trackData.isTransformCollapsed = newVal;
60 } 62 }
61 } 63 }
62 }, 64 },
@@ -70,6 +72,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
70 set:function (newVal) { 72 set:function (newVal) {
71 if (newVal !== this._isPositionCollapsed) { 73 if (newVal !== this._isPositionCollapsed) {
72 this._isPositionCollapsed = newVal; 74 this._isPositionCollapsed = newVal;
75 this.trackData.isPositionCollapsed = newVal;
73 } 76 }
74 } 77 }
75 }, 78 },
@@ -83,6 +86,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
83 set:function (newVal) { 86 set:function (newVal) {
84 if (newVal !== this._isStyleCollapsed) { 87 if (newVal !== this._isStyleCollapsed) {
85 this._isStyleCollapsed = newVal; 88 this._isStyleCollapsed = newVal;
89 this.trackData.isStyleCollapsed = newVal;
86 } 90 }
87 } 91 }
88 }, 92 },
@@ -96,8 +100,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
96 return this._bypassAnimation; 100 return this._bypassAnimation;
97 }, 101 },
98 set: function(newVal) { 102 set: function(newVal) {
99 //console.log("timelinetrack bypassAnimation setter " + newVal) 103 if ((newVal !== this._bypassAnimation) && (typeof(this.trackData) !== "undefined")) {
100 this._bypassAnimation = newVal; 104 this._bypassAnimation = newVal;
105 this.trackData.bypassAnimation = newVal;
106 }
101 } 107 }
102 }, 108 },
103 109
@@ -114,7 +120,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
114 }, 120 },
115 set: function(newVal) { 121 set: function(newVal) {
116 this._arrStyleTracks = newVal; 122 this._arrStyleTracks = newVal;
117 //this.needsDraw = true; 123 this.trackData.arrStyleTracks = newVal;
118 } 124 }
119 }, 125 },
120 _styleTracksRepetition: { 126 _styleTracksRepetition: {
@@ -128,7 +134,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
128 }, 134 },
129 set: function(newVal) { 135 set: function(newVal) {
130 this._styleTracksRepetition = newVal; 136 this._styleTracksRepetition = newVal;
131 //needsDraw = true;
132 } 137 }
133 }, 138 },
134 139
@@ -146,7 +151,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
146 }, 151 },
147 set: function(newVal) { 152 set: function(newVal) {
148 this._arrPositionTracks = newVal; 153 this._arrPositionTracks = newVal;
149 //this.needsDraw = true; 154 this.trackData.arrPositionTracks = newVal;
150 } 155 }
151 }, 156 },
152 _positionTracksRepetition: { 157 _positionTracksRepetition: {
@@ -160,7 +165,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
160 }, 165 },
161 set: function(newVal) { 166 set: function(newVal) {
162 this._positionTracksRepetition = newVal; 167 this._positionTracksRepetition = newVal;
163 //this.needsDraw = true;
164 } 168 }
165 }, 169 },
166 170
@@ -179,7 +183,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
179 }, 183 },
180 set: function(newVal) { 184 set: function(newVal) {
181 this._arrTransformTracks = newVal; 185 this._arrTransformTracks = newVal;
182 //this.needsDraw = true; 186 this.trackData.arrTransformTracks = newVal;
183 } 187 }
184 }, 188 },
185 _transformTracksRepetition: { 189 _transformTracksRepetition: {
@@ -193,7 +197,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
193 }, 197 },
194 set: function(newVal) { 198 set: function(newVal) {
195 this._transformTracksRepetition = newVal; 199 this._transformTracksRepetition = newVal;
196 //this.needsDraw = true;
197 } 200 }
198 }, 201 },
199 202
@@ -209,7 +212,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
209 }, 212 },
210 set:function (newVal) { 213 set:function (newVal) {
211 this._tweens = newVal; 214 this._tweens = newVal;
212 //this.needsDraw=true; 215 this.trackData.tweens = newVal;
213 } 216 }
214 }, 217 },
215 218
@@ -243,6 +246,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
243 if(this._trackDuration > this.application.ninja.timeline.masterDuration){ 246 if(this._trackDuration > this.application.ninja.timeline.masterDuration){
244 this.application.ninja.timeline.masterDuration = this._trackDuration; 247 this.application.ninja.timeline.masterDuration = this._trackDuration;
245 } 248 }
249 this.trackData.trackDuration = val;
246 } 250 }
247 }, 251 },
248 252
@@ -258,6 +262,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
258 }, 262 },
259 set:function (val) { 263 set:function (val) {
260 this._trackPosition = val; 264 this._trackPosition = val;
265 this.trackData.trackPosition = val;
261 } 266 }
262 }, 267 },
263 268
@@ -273,6 +278,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
273 }, 278 },
274 set:function(val){ 279 set:function(val){
275 this._currentKeyframeRule = val; 280 this._currentKeyframeRule = val;
281 this.trackData.currentKeyframeRule = val;
276 } 282 }
277 }, 283 },
278 284
@@ -296,21 +302,25 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
296 }, 302 },
297 set:function(val){ 303 set:function(val){
298 this._isTrackAnimated = val; 304 this._isTrackAnimated = val;
305 this.trackData.isTrackAni