aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js11
1 files changed, 4 insertions, 7 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 30678beb..fb2ce4b4 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -234,8 +234,8 @@ var Tween = exports.Tween = Montage.create(Component, {
234 //console.log(eventDetail); 234 //console.log(eventDetail);
235 235
236 if(eventDetail.type == "setProperties"){ 236 if(eventDetail.type == "setProperties"){
237 // ignore top, left, width, and height 237 // need to ignore top, left, width, and height
238 console.log(eventDetail.data.value[0]); 238 //console.log(eventDetail.data.value[0]);
239 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0]; 239 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
240 this.parentComponent.parentComponent.updatePropKeyframeRule(); 240 this.parentComponent.parentComponent.updatePropKeyframeRule();
241 241
@@ -245,8 +245,8 @@ var Tween = exports.Tween = Montage.create(Component, {
245 this.parentComponent.parentComponent.updatePropKeyframeRule(); 245 this.parentComponent.parentComponent.updatePropKeyframeRule();
246 246
247 } else if(eventDetail.type == "setProperty"){ 247 } else if(eventDetail.type == "setProperty"){
248 // ignore top, left, width, and height 248 // need to ignore top, left, width, and height
249 console.log(eventDetail.data.value[0]); 249 //console.log(eventDetail.data.value[0]);
250 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0]; 250 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
251 this.parentComponent.parentComponent.updatePropKeyframeRule(); 251 this.parentComponent.parentComponent.updatePropKeyframeRule();
252 252
@@ -279,9 +279,6 @@ var Tween = exports.Tween = Montage.create(Component, {
279 if(this.parentComponent.parentComponent.isSubproperty){ 279 if(this.parentComponent.parentComponent.isSubproperty){
280 // set property specific style on element 280 // set property specific style on element
281 var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty]; 281 var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty];
282
283
284
285 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], this.parentComponent.parentComponent.trackEditorProperty, [currentValue], "Change", "tween"); 282 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], this.parentComponent.parentComponent.trackEditorProperty, [currentValue], "Change", "tween");
286 283
287 } else { 284 } else {