diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 4 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 19 |
3 files changed, 7 insertions, 18 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 9fb33956..245aabd4 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -60,7 +60,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
60 | } | 60 | } |
61 | }, | 61 | }, |
62 | _styleCounter : { | 62 | _styleCounter : { |
63 | value: 4 | 63 | value: 0 |
64 | }, | 64 | }, |
65 | styleCounter:{ | 65 | styleCounter:{ |
66 | serializable:true, | 66 | serializable:true, |
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 8316540b..4f798f36 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
@@ -146,6 +146,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
146 | this.styleIndex = this.propTrackData.styleIndex; | 146 | this.styleIndex = this.propTrackData.styleIndex; |
147 | this.propTweens = this.propTrackData.propTweens; | 147 | this.propTweens = this.propTrackData.propTweens; |
148 | this.trackType = this.propTrackData.trackType; | 148 | this.trackType = this.propTrackData.trackType; |
149 | this.trackEditorProperty = this.propTrackData.trackEditorProperty; | ||
149 | this.needsDraw = true; | 150 | this.needsDraw = true; |
150 | } | 151 | } |
151 | }, | 152 | }, |
@@ -170,12 +171,9 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
170 | } | 171 | } |
171 | } else if (this.trackType === "position") { | 172 | } else if (this.trackType === "position") { |
172 | console.log("clicking on position track"); | 173 | console.log("clicking on position track"); |
173 | |||
174 | console.log(this.trackEditorProperty); | 174 | console.log(this.trackEditorProperty); |
175 | } | 175 | } |
176 | 176 | ||
177 | |||
178 | |||
179 | this.insertPropTween(0); | 177 | this.insertPropTween(0); |
180 | this.addPropAnimationRuleToElement(ev); | 178 | this.addPropAnimationRuleToElement(ev); |
181 | this.updatePropKeyframeRule(); | 179 | this.updatePropKeyframeRule(); |
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 2ce1a637..a1b1ce74 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -501,11 +501,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
501 | } | 501 | } |
502 | } | 502 | } |
503 | } | 503 | } |
504 | |||
505 | |||
506 | |||
507 | |||
508 | |||
509 | 504 | ||
510 | } | 505 | } |
511 | }, | 506 | }, |
@@ -798,18 +793,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
798 | // Init and event handler for layer expand/collapse | 793 | // Init and event handler for layer expand/collapse |
799 | init:{ | 794 | init:{ |
800 | value:function () { | 795 | value:function () { |
801 | |||
802 | // create track objects for position and transform tracks and push into arrays instead of dummy arrays | ||
803 | |||
804 | this.createPositionTracks(); | 796 | this.createPositionTracks(); |
805 | //this.arrPositionTracks = [0, 1, 2, 3]; | ||
806 | |||
807 | // get rid of transform tracks | ||
808 | //this.arrTransformTracks = [0, 1, 2, 3, 4]; | ||
809 | |||
810 | // Register event handler for layer events. | 797 | // Register event handler for layer events. |
811 | defaultEventManager.addEventListener("layerEvent", this, false); | 798 | defaultEventManager.addEventListener("layerEvent", this, false); |
812 | |||
813 | } | 799 | } |
814 | }, | 800 | }, |
815 | 801 | ||
@@ -823,6 +809,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
823 | newTopTrack.propTrackData.propTweens = []; | 809 | newTopTrack.propTrackData.propTweens = []; |
824 | newTopTrack.propTrackData.styleIndex = 0; | 810 | newTopTrack.propTrackData.styleIndex = 0; |
825 | newTopTrack.propTrackData.trackType = "position"; | 811 | newTopTrack.propTrackData.trackType = "position"; |
812 | newTopTrack.propTrackData.trackEditorProperty = "top"; | ||
826 | this.arrPositionTracks.push(newTopTrack); | 813 | this.arrPositionTracks.push(newTopTrack); |
827 | 814 | ||
828 | // create 'left' track | 815 | // create 'left' track |
@@ -831,6 +818,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
831 | newLeftTrack.propTrackData.propTweens = []; | 818 | newLeftTrack.propTrackData.propTweens = []; |
832 | newLeftTrack.propTrackData.styleIndex = 1; | 819 | newLeftTrack.propTrackData.styleIndex = 1; |
833 | newLeftTrack.propTrackData.trackType = "position"; | 820 | newLeftTrack.propTrackData.trackType = "position"; |
821 | newLeftTrack.propTrackData.trackEditorProperty = "left"; | ||
834 | this.arrPositionTracks.push(newLeftTrack); | 822 | this.arrPositionTracks.push(newLeftTrack); |
835 | 823 | ||
836 | // create 'width' track | 824 | // create 'width' track |
@@ -839,6 +827,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
839 | newWidthTrack.propTrackData.propTweens = []; | 827 | newWidthTrack.propTrackData.propTweens = []; |
840 | newWidthTrack.propTrackData.styleIndex = 2; | 828 | newWidthTrack.propTrackData.styleIndex = 2; |
841 | newWidthTrack.propTrackData.trackType = "position"; | 829 | newWidthTrack.propTrackData.trackType = "position"; |
830 | newWidthTrack.propTrackData.trackEditorProperty = "width"; | ||
842 | this.arrPositionTracks.push(newWidthTrack); | 831 | this.arrPositionTracks.push(newWidthTrack); |
843 | 832 | ||
844 | // create 'height' track | 833 | // create 'height' track |
@@ -847,6 +836,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
847 | newHeightTrack.propTrackData.propTweens = []; | 836 | newHeightTrack.propTrackData.propTweens = []; |
848 | newHeightTrack.propTrackData.styleIndex = 3; | 837 | newHeightTrack.propTrackData.styleIndex = 3; |
849 | newHeightTrack.propTrackData.trackType = "position"; | 838 | newHeightTrack.propTrackData.trackType = "position"; |
839 | newHeightTrack.propTrackData.trackEditorProperty = "height"; | ||
850 | this.arrPositionTracks.push(newHeightTrack); | 840 | this.arrPositionTracks.push(newHeightTrack); |
851 | } | 841 | } |
852 | }, | 842 | }, |
@@ -864,6 +854,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
864 | newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection; | 854 | newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection; |
865 | newStyleTrack.propTrackData.propTweens = []; | 855 | newStyleTrack.propTrackData.propTweens = []; |
866 | newStyleTrack.propTrackData.trackType = "style"; | 856 | newStyleTrack.propTrackData.trackType = "style"; |
857 | newStyleTrack.propTrackData.trackEditorProperty = ""; | ||
867 | newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex; | 858 | newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex; |
868 | 859 | ||
869 | console.log(layerEvent.styleIndex); | 860 | console.log(layerEvent.styleIndex); |