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.html52
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js19
2 files changed, 17 insertions, 54 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index dc32d44d..3f3bf24a 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -100,26 +100,6 @@
100 "element":{"#": "position-track-base"} 100 "element":{"#": "position-track-base"}
101 } 101 }
102 }, 102 },
103 "transformTracksRepetition": {
104 "prototype": "montage/ui/repetition.reel",
105 "properties": {
106 "element": {"#": "content-transform-tracks"},
107 "isSelectionEnabled" : false
108 },
109 "bindings": {
110 "objects": {
111 "boundObject": {"@": "owner"},
112 "boundObjectPropertyPath": "arrTransformTracks",
113 "oneway": false
114 }
115 }
116 },
117 "transformPropertyTrack" : {
118 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
119 "properties" : {
120 "element":{"#": "transform-track-base"}
121 }
122 },
123 103
124 "mainCollapser" : { 104 "mainCollapser" : {
125 "prototype" : "js/panels/timeline/Collapser", 105 "prototype" : "js/panels/timeline/Collapser",
@@ -171,31 +151,6 @@
171 } 151 }
172 }, 152 },
173 153
174 "transformCollapser" : {
175 "prototype" : "js/panels/timeline/Collapser",
176 "properties" : {
177 "element" : {"#" : "content-transform-tracks"},
178 "myContent" : {"#":"content-transform-tracks"},
179 "contentHeight" : 40,
180 "isLabelClickable" : false,
181 "clicker" : {"#" : "label-transform"},
182 "isCollapsed" : true,
183 "isAnimated" : true
184 },
185 "bindings" : {
186 "isToggling" : {
187 "boundObject" : {"@" : "owner" },
188 "boundObjectPropertyPath" : "isTransformCollapsed",
189 "oneway" : false
190 },
191 "bypassAnimation" : {
192 "boundObject" : {"@": "owner"},
193 "boundObjectPropertyPath" : "bypassAnimation",
194 "oneway" : false
195 }
196 }
197 },
198
199 "styleCollapser" : { 154 "styleCollapser" : {
200 "prototype" : "js/panels/timeline/Collapser", 155 "prototype" : "js/panels/timeline/Collapser",
201 "properties" : { 156 "properties" : {
@@ -239,12 +194,7 @@
239 <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position-tracks"> 194 <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position-tracks">
240 <div data-montage-id="position-track-base"></div> 195 <div data-montage-id="position-track-base"></div>
241 </div> 196 </div>
242 <div class="label-transform collapsible-label collapsible-collapsed" data-montage-id="label-transform"> 197
243
244 </div>
245 <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform-tracks">
246 <div data-montage-id="transform-track-base"></div>
247 </div>
248 <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles"> 198 <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles">
249 199
250 </div> 200 </div>
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index ddeb1449..891feada 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -771,6 +771,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
771 // delete the current rule 771 // delete the current rule
772 this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule); 772 this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule);
773 773
774 // first combine all style track tween arrays with the main track tween array
775
774 // build the new keyframe string 776 // build the new keyframe string
775 var keyframeString = "@-webkit-keyframes " + this.animationName + " {"; 777 var keyframeString = "@-webkit-keyframes " + this.animationName + " {";
776 778
@@ -796,9 +798,14 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
796 // Init and event handler for layer expand/collapse 798 // Init and event handler for layer expand/collapse
797 init:{ 799 init:{
798 value:function () { 800 value:function () {
799 801
800 this.arrPositionTracks = [0, 1]; 802 // create track objects for position and transform tracks and push into arrays instead of dummy arrays
801 this.arrTransformTracks = [0, 1, 2, 3, 4]; 803
804 //this.createPositionTracks();
805 this.arrPositionTracks = [0, 1, 2, 3];
806
807 // get rid of transform tracks
808 //this.arrTransformTracks = [0, 1, 2, 3, 4];
802 809
803 // Register event handler for layer events. 810 // Register event handler for layer events.
804 defaultEventManager.addEventListener("layerEvent", this, false); 811 defaultEventManager.addEventListener("layerEvent", this, false);
@@ -806,6 +813,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
806 } 813 }
807 }, 814 },
808 815
816 createPositionTracks:{
817 value:function(){
818 // create track objects for position and transform tracks and push into arrays
819 }
820 },
821
809 handleLayerEvent:{ 822 handleLayerEvent:{
810 value:function (layerEvent) { 823 value:function (layerEvent) {
811 if (layerEvent.layerID !== this.trackID) { 824 if (layerEvent.layerID !== this.trackID) {