diff options
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 8d9fd964..5839e0ac 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -819,7 +819,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
819 | 819 | ||
820 | getAllAnimationRules:{ | 820 | getAllAnimationRules:{ |
821 | value:function(ruleNames){ | 821 | value:function(ruleNames){ |
822 | //console.log(ruleNames); | ||
823 | 822 | ||
824 | for(var i in ruleNames){ | 823 | for(var i in ruleNames){ |
825 | var currentName = ruleNames[i].replace(/^\s+|\s+$/g,""); // trim whitespace | 824 | var currentName = ruleNames[i].replace(/^\s+|\s+$/g,""); // trim whitespace |
@@ -833,17 +832,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
833 | recreatePropertyTracks:{ | 832 | recreatePropertyTracks:{ |
834 | value:function(ruleSet){ | 833 | value:function(ruleSet){ |
835 | 834 | ||
836 | //var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | ||
837 | //var test = this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(); | ||
838 | //console.log(test); | ||
839 | |||
840 | for(var i in ruleSet){ | 835 | for(var i in ruleSet){ |
841 | console.log(i); | ||
842 | //console.log(ruleSet[i]); | ||
843 | var styleProp = ruleSet[i][0].style[0]; | 836 | var styleProp = ruleSet[i][0].style[0]; |
844 | console.log(styleProp); | ||
845 | this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp); | 837 | this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp); |
846 | } | 838 | } |
839 | |||
847 | } | 840 | } |
848 | }, | 841 | }, |
849 | 842 | ||
@@ -881,14 +874,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
881 | var keyframePercent = Math.round((keyMill / trackDur) * 100) + "%"; | 874 | var keyframePercent = Math.round((keyMill / trackDur) * 100) + "%"; |
882 | var keyframePropertyString = " " + keyframePercent + " {"; | 875 | var keyframePropertyString = " " + keyframePercent + " {"; |
883 | for(var prop in this.tweens[i].tweenData.tweenedProperties){ | 876 | for(var prop in this.tweens[i].tweenData.tweenedProperties){ |
884 | console.log(prop + " - " + this.tweens[i].tweenData.tweenedProperties[prop]); | 877 | //console.log(prop + " - " + this.tweens[i].tweenData.tweenedProperties[prop]); |
885 | keyframePropertyString += prop + ": " + this.tweens[i].tweenData.tweenedProperties[prop] + ";"; | 878 | keyframePropertyString += prop + ": " + this.tweens[i].tweenData.tweenedProperties[prop] + ";"; |
886 | } | 879 | } |
887 | keyframePropertyString += "}"; | 880 | keyframePropertyString += "}"; |
888 | keyframeString += keyframePropertyString; | 881 | keyframeString += keyframePropertyString; |
889 | } | 882 | } |
890 | keyframeString += " }"; | 883 | keyframeString += " }"; |
891 | console.log(keyframeString); | ||
892 | // set the keyframe string as the new rule | 884 | // set the keyframe string as the new rule |
893 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); | 885 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); |
894 | this.application.ninja.documentController.activeDocument.needsSave = true; | 886 | this.application.ninja.documentController.activeDocument.needsSave = true; |