aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJonathan Duran2012-05-14 23:08:24 -0700
committerJonathan Duran2012-05-14 23:08:24 -0700
commit13ebb58be961e92ba7c109298ef73daa7dea79c7 (patch)
tree262357a452bcf23d407682dd077c0982b576647c /js
parentb38e020fb5e64c7d9a1d42c97393a0a84f9841a8 (diff)
downloadninja-13ebb58be961e92ba7c109298ef73daa7dea79c7.tar.gz
fix keyframe bug when adding keyframes to sub properties
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js4
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js2
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js8
3 files changed, 5 insertions, 9 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 03287df9..8d2c1918 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -291,12 +291,12 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
291 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames); 291 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames);
292 292
293 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration); 293 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration);
294 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", newIterationCount); 294 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", newIterationCount);
295 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both"); 295 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both");
296 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-transition-timing-function", "linear"); 296 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-transition-timing-function", "linear");
297 297
298 var initRule = "@-webkit-keyframes " + this.animationName + " { 0% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} 100% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} }"; 298 var initRule = "@-webkit-keyframes " + this.animationName + " { 0% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} 100% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} }";
299 console.log(initRule); 299 //console.log(initRule);
300 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule); 300 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule);
301 301
302 this.insertPropTween(tweenEvent.offsetX); 302 this.insertPropTween(tweenEvent.offsetX);
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 0e40e222..d8259281 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -603,8 +603,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
603 this.addAnimationRuleToElement(ev); 603 this.addAnimationRuleToElement(ev);
604 this.updateKeyframeRule(); 604 this.updateKeyframeRule();
605 } else { 605 } else {
606 this.handleNewTween(ev);
607 if (ev.target.className === "tracklane") { 606 if (ev.target.className === "tracklane") {
607 this.handleNewTween(ev);
608 this.updateKeyframeRule(); 608 this.updateKeyframeRule();
609 } 609 }
610 } 610 }
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index bcd3d75f..846c2f1c 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -240,22 +240,18 @@ var Tween = exports.Tween = Montage.create(Component, {
240 240
241 setStyleTweenProperty:{ 241 setStyleTweenProperty:{
242 value:function (eventDetail) { 242 value:function (eventDetail) {
243 console.log("Setting style tween properties for: " + this.parentComponent.parentComponent.trackEditorProperty); 243 //console.log("Setting style tween properties for: " + this.parentComponent.parentComponent.trackEditorProperty);
244 console.log(eventDetail); 244 //console.log(eventDetail);
245 245
246 if(eventDetail.type == "setProperties"){ 246 if(eventDetail.type == "setProperties"){
247 // ignore top, left, width, and height 247 // ignore top, left, width, and height
248 console.log(eventDetail.data.value[0]); 248 console.log(eventDetail.data.value[0]);
249 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0]; 249 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
250 console.log(this.tweenedProperties); 250 console.log(this.tweenedProperties);
251
252 } else if(eventDetail.type == "setColor"){ 251 } else if(eventDetail.type == "setColor"){
253 console.log(eventDetail.data.value.color.css);
254 var prop = this.parentComponent.parentComponent.trackEditorProperty; 252 var prop = this.parentComponent.parentComponent.trackEditorProperty;
255 this.tweenedProperties[prop] = eventDetail.data.value.color.css; 253 this.tweenedProperties[prop] = eventDetail.data.value.color.css;
256 console.log(this.tweenedProperties[prop]);
257 this.parentComponent.parentComponent.updatePropKeyframeRule(); 254 this.parentComponent.parentComponent.updatePropKeyframeRule();
258
259 } else if(eventDetail.type == "setProperty"){ 255 } else if(eventDetail.type == "setProperty"){
260 // ignore top, left, width, and height 256 // ignore top, left, width, and height
261 console.log(eventDetail.data.value[0]); 257 console.log(eventDetail.data.value[0]);