diff options
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 18 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 4 |
2 files changed, 10 insertions, 12 deletions
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, { | |||
24 | 24 | ||
25 | draw:{ | 25 | draw:{ |
26 | value:function(){ | 26 | value:function(){ |
27 | console.log(this.currentKeyframeRule); | 27 | |
28 | } | 28 | } |
29 | }, | 29 | }, |
30 | 30 | ||
31 | didDraw:{ | 31 | didDraw:{ |
32 | value:function () { | 32 | value:function () { |
33 | if ((!this.application.ninja.documentController.creatingNewFile) || (!this.application.ninja.currentDocument.setLevel)) { | 33 | if(this.currentKeyframeRule){ |
34 | if (this.application.ninja.currentDocument.model.documentRoot.children[0]) { | 34 | this.retrieveStoredStyleTweens(); |
35 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | ||
36 | if (selectedIndex !== false) { | ||
37 | if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { | ||
38 | this.retrieveStoredStyleTweens(); | ||
39 | } | ||
40 | } | ||
41 | } | ||
42 | } | 35 | } |
43 | } | 36 | } |
44 | }, | 37 | }, |
@@ -317,6 +310,9 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
317 | retrieveStoredStyleTweens:{ | 310 | retrieveStoredStyleTweens:{ |
318 | value:function(){ | 311 | value:function(){ |
319 | console.log("retrieving style tweens"); | 312 | console.log("retrieving style tweens"); |
313 | console.log(this.currentKeyframeRule); | ||
314 | |||
315 | |||
320 | var percentValue, fraction, splitValue; | 316 | var percentValue, fraction, splitValue; |
321 | var currentMilliSec, currentMilliSecPerPixel, clickPosition, tempTiming, tempTimingFloat, trackTiming, i = 0; | 317 | var currentMilliSec, currentMilliSecPerPixel, clickPosition, tempTiming, tempTimingFloat, trackTiming, i = 0; |
322 | 318 | ||
@@ -327,6 +323,8 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
327 | // build tweens for this tracks's keyframe rule | 323 | // build tweens for this tracks's keyframe rule |
328 | if (this.animationName) { | 324 | if (this.animationName) { |
329 | 325 | ||
326 | |||
327 | |||
330 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); | 328 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); |
331 | this.nextKeyframe = 0; | 329 | this.nextKeyframe = 0; |
332 | 330 | ||
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index efaf7aa8..3b2b3fff 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -831,8 +831,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
831 | value:function(ruleSet){ | 831 | value:function(ruleSet){ |
832 | for(var i in ruleSet){ | 832 | for(var i in ruleSet){ |
833 | var styleProp = ruleSet[i][0].style[0]; | 833 | var styleProp = ruleSet[i][0].style[0]; |
834 | console.log(styleProp); | 834 | //console.log(styleProp); |
835 | console.log(ruleSet[i]); | 835 | //console.log(ruleSet[i]); |
836 | this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp, ruleSet[i]); | 836 | this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp, ruleSet[i]); |
837 | } | 837 | } |
838 | } | 838 | } |