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.html77
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js115
2 files changed, 121 insertions, 71 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 9de703f9..35afd1b9 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -53,7 +53,6 @@
53 } 53 }
54 } 54 }
55 }, 55 },
56
57 "styleTrackRepetition": { 56 "styleTrackRepetition": {
58 "prototype": "montage/ui/repetition.reel", 57 "prototype": "montage/ui/repetition.reel",
59 "properties": { 58 "properties": {
@@ -68,6 +67,19 @@
68 } 67 }
69 } 68 }
70 }, 69 },
70 "stylePropertyTrack" : {
71 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
72 "properties" : {
73 "element":{"#": "style-track-base"}
74 },
75 "bindings" : {
76 "propTrackData" : {
77 "boundObject" : {"@" : "styleTrackRepetition"},
78 "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData",
79 "oneway" : false
80 }
81 }
82 },
71 "positionTracksRepetition": { 83 "positionTracksRepetition": {
72 "prototype": "montage/ui/repetition.reel", 84 "prototype": "montage/ui/repetition.reel",
73 "properties": { 85 "properties": {
@@ -86,27 +98,14 @@
86 "prototype" : "js/panels/Timeline/PropertyTrack.reel", 98 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
87 "properties" : { 99 "properties" : {
88 "element":{"#": "position-track-base"} 100 "element":{"#": "position-track-base"}
89 } 101 },
90 }, 102 "bindings" : {
91 "transformTracksRepetition": { 103 "propTrackData" : {
92 "prototype": "montage/ui/repetition.reel", 104 "boundObject" : {"@" : "positionTracksRepetition"},
93 "properties": { 105 "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData",
94 "element": {"#": "content-transform-tracks"}, 106 "oneway" : false
95 "isSelectionEnabled" : false 107 }
96 }, 108 }
97 "bindings": {
98 "objects": {
99 "boundObject": {"@": "owner"},
100 "boundObjectPropertyPath": "arrTransformTracks",
101 "oneway": false
102 }
103 }
104 },
105 "transformPropertyTrack" : {
106 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
107 "properties" : {
108 "element":{"#": "transform-track-base"}
109 }
110 }, 109 },
111 110
112 "mainCollapser" : { 111 "mainCollapser" : {
@@ -159,31 +158,6 @@
159 } 158 }
160 }, 159 },
161 160
162 "transformCollapser" : {
163 "prototype" : "js/panels/timeline/Collapser",
164 "properties" : {
165 "element" : {"#" : "content-transform-tracks"},
166 "myContent" : {"#":"content-transform-tracks"},
167 "contentHeight" : 40,
168 "isLabelClickable" : false,
169 "clicker" : {"#" : "label-transform"},
170 "isCollapsed" : true,
171 "isAnimated" : true
172 },
173 "bindings" : {
174 "isToggling" : {
175 "boundObject" : {"@" : "owner" },
176 "boundObjectPropertyPath" : "isTransformCollapsed",
177 "oneway" : false
178 },
179 "bypassAnimation" : {
180 "boundObject" : {"@": "owner"},
181 "boundObjectPropertyPath" : "bypassAnimation",
182 "oneway" : false
183 }
184 }
185 },
186
187 "styleCollapser" : { 161 "styleCollapser" : {
188 "prototype" : "js/panels/timeline/Collapser", 162 "prototype" : "js/panels/timeline/Collapser",
189 "properties" : { 163 "properties" : {
@@ -227,17 +201,12 @@
227 <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position-tracks"> 201 <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position-tracks">
228 <div data-montage-id="position-track-base"></div> 202 <div data-montage-id="position-track-base"></div>
229 </div> 203 </div>
230 <div class="label-transform collapsible-label collapsible-collapsed" data-montage-id="label-transform"> 204
231
232 </div>
233 <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform-tracks">
234 <div data-montage-id="transform-track-base"></div>
235 </div>
236 <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles"> 205 <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles">
237 206
238 </div> 207 </div>
239 <div data-montage-id="content-styles" class="content-styles collapsible-content collapsible-collapsed"> 208 <div data-montage-id="content-styles" class="content-styles collapsible-content collapsible-collapsed">
240 <div class="timeline-track"></div> 209 <div data-montage-id="style-track-base"></div>
241 </div> 210 </div>
242 </div> 211 </div>
243 </div> 212 </div>
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 1e918c6e..83aef230 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -223,10 +223,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
223 223
224 tweenRepetition:{ 224 tweenRepetition:{
225 get:function () { 225 get:function () {
226 return this._spanRepetition; 226 return this._tweenRepetition;
227 }, 227 },
228 set:function (newVal) { 228 set:function (newVal) {
229 this._spanRepetition = newVal; 229 this._tweenRepetition = newVal;
230 } 230 }
231 }, 231 },
232 232
@@ -412,7 +412,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
412 this.bypassAnimation = this.trackData.bypassAnimation; 412 this.bypassAnimation = this.trackData.bypassAnimation;
413 this.trackID = this.trackData.layerID; 413 this.trackID = this.trackData.layerID;
414 this.tweens = this.trackData.tweens; 414 this.tweens = this.trackData.tweens;
415 this.animatedElement = this.trackData.animatedElement; // unneeded with one element per layer restriction 415 this.animatedElement = this.trackData.animatedElement;
416 this.arrStyleTracks = this.trackData.arrStyleTracks; 416 this.arrStyleTracks = this.trackData.arrStyleTracks;
417 this.isTrackAnimated = this.trackData.isTrackAnimated; 417 this.isTrackAnimated = this.trackData.isTrackAnimated;
418 this.trackDuration = this.trackData.trackDuration; 418 this.trackDuration = this.trackData.trackDuration;
@@ -520,11 +520,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
520 } 520 }
521 } 521 }
522 } 522 }
523
524
525
526
527
528 523
529 } 524 }
530 }, 525 },
@@ -537,7 +532,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
537 if (selectedIndex !== false) { 532 if (selectedIndex !== false) {
538 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { 533 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
539 this.retrieveStoredTweens(); 534 this.retrieveStoredTweens();
540
541 } 535 }
542 } 536 }
543 } 537 }
@@ -628,6 +622,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
628 this.updateKeyframeRule(); 622 this.updateKeyframeRule();
629 } 623 }
630 } else { 624 } else {
625 // TEMP error check
631 console.log("There must be exactly one element in an animated layer."); 626 console.log("There must be exactly one element in an animated layer.");
632 } 627 }
633 } 628 }
@@ -641,6 +636,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
641 this.application.ninja.timeline.selectLayer(selectedIndex, false);