aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index bd55f2fb..efaf7aa8 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -829,14 +829,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
829 829
830 recreatePropertyTracks:{ 830 recreatePropertyTracks:{
831 value:function(ruleSet){ 831 value:function(ruleSet){
832
833
834 for(var i in ruleSet){ 832 for(var i in ruleSet){
835 var styleProp = ruleSet[i][0].style[0]; 833 var styleProp = ruleSet[i][0].style[0];
836 console.log(styleProp); 834 console.log(styleProp);
837 this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp); 835 console.log(ruleSet[i]);
836 this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp, ruleSet[i]);
838 } 837 }
839
840 } 838 }
841 }, 839 },
842 840
@@ -881,8 +879,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
881 keyframeString += keyframePropertyString; 879 keyframeString += keyframePropertyString;
882 } 880 }
883 keyframeString += " }"; 881 keyframeString += " }";
882 //console.log(keyframeString);
884 // set the keyframe string as the new rule 883 // set the keyframe string as the new rule
885 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); 884 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString);
885 //console.log(this.currentKeyframeRule);
886 this.application.ninja.currentDocument.model.needsSave = true; 886 this.application.ninja.currentDocument.model.needsSave = true;
887 } 887 }
888 }, 888 },
@@ -944,8 +944,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
944 return; 944 return;
945 } 945 }
946 if (layerEvent.layerEventType === "newStyle") { 946 if (layerEvent.layerEventType === "newStyle") {
947 // TODO: Add a real track of tweens. Probably need a method for that.
948
949 var newStyleTrack = {}; 947 var newStyleTrack = {};
950 newStyleTrack.propTrackData = {}; 948 newStyleTrack.propTrackData = {};
951 newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection; 949 newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection;
@@ -953,6 +951,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
953 newStyleTrack.propTrackData.trackType = "style"; 951 newStyleTrack.propTrackData.trackType = "style";
954 newStyleTrack.propTrackData.trackEditorProperty = ""; 952 newStyleTrack.propTrackData.trackEditorProperty = "";
955 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex; 953 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex;
954 newStyleTrack.propTrackData.existingRule = "";
956 955
957 this.arrStyleTracks.push(newStyleTrack); 956 this.arrStyleTracks.push(newStyleTrack);
958 957
@@ -964,6 +963,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
964 restoredStyleTrack.propTrackData.trackType = "style"; 963 restoredStyleTrack.propTrackData.trackType = "style";
965 restoredStyleTrack.propTrackData.trackEditorProperty = layerEvent.trackEditorProperty; 964 restoredStyleTrack.propTrackData.trackEditorProperty = layerEvent.trackEditorProperty;
966 restoredStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex; 965 restoredStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex;
966 restoredStyleTrack.propTrackData.existingRule = layerEvent.existingRule;
967 967
968 this.arrStyleTracks.push(restoredStyleTrack); 968 this.arrStyleTracks.push(restoredStyleTrack);
969 } 969 }