From f555dbb070dae53bf81f49d148d59f0a32726811 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Tue, 12 Jun 2012 08:33:14 -0700 Subject: remove some console logs and simply the prop tween retrieval conditions Signed-off-by: Jonathan Duran --- js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js') diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index d602641e..0ad0f34e 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js @@ -24,21 +24,14 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { draw:{ value:function(){ - console.log(this.currentKeyframeRule); + } }, didDraw:{ value:function () { - if ((!this.application.ninja.documentController.creatingNewFile) || (!this.application.ninja.currentDocument.setLevel)) { - if (this.application.ninja.currentDocument.model.documentRoot.children[0]) { - var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); - if (selectedIndex !== false) { - if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { - this.retrieveStoredStyleTweens(); - } - } - } + if(this.currentKeyframeRule){ + this.retrieveStoredStyleTweens(); } } }, @@ -317,6 +310,9 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { retrieveStoredStyleTweens:{ value:function(){ console.log("retrieving style tweens"); + console.log(this.currentKeyframeRule); + + var percentValue, fraction, splitValue; var currentMilliSec, currentMilliSecPerPixel, clickPosition, tempTiming, tempTimingFloat, trackTiming, i = 0; @@ -327,6 +323,8 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { // build tweens for this tracks's keyframe rule if (this.animationName) { + + trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); this.nextKeyframe = 0; -- cgit v1.2.3