aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html4
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js12
2 files changed, 2 insertions, 14 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 35afd1b9..0d7f517f 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -15,12 +15,10 @@
15 "properties": { 15 "properties": {
16 "element": {"#": "track"}, 16 "element": {"#": "track"},
17 "tweenRepetition" : {"@" : "tweenRepetition"}, 17 "tweenRepetition" : {"@" : "tweenRepetition"},
18 "styleTracksRepetition" : {"@" : "styleTracksRepetition"},
19 "track_lanes" : {"#" : "track_lanes"}, 18 "track_lanes" : {"#" : "track_lanes"},
20 "tween": {"@" : "tween"}, 19 "tween": {"@" : "tween"},
21 "_mainCollapser" : {"@" : "mainCollapser"}, 20 "_mainCollapser" : {"@" : "mainCollapser"},
22 "_positionCollapser" : {"@" : "positionCollapser"}, 21 "_positionCollapser" : {"@" : "positionCollapser"},
23 "_transformCollapser" : {"@" : "transformCollapser"},
24 "_styleCollapser" : {"@" : "styleCollapser"} 22 "_styleCollapser" : {"@" : "styleCollapser"}
25 } 23 }
26 }, 24 },
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 83aef230..8b3938f4 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -141,6 +141,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
141 value: null 141 value: null
142 }, 142 },
143 styleTracksRepetition : { 143 styleTracksRepetition : {
144 serializable:true,
144 get: function() { 145 get: function() {
145 return this._styleTracksRepetition; 146 return this._styleTracksRepetition;
146 }, 147 },
@@ -190,17 +191,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
190 this.trackData.arrTransformTracks = newVal; 191 this.trackData.arrTransformTracks = newVal;
191 } 192 }
192 }, 193 },
193 _transformTracksRepetition: {
194 value: null
195 },
196 transformTracksRepetition : {
197 get: function() {
198 return this._transformTracksRepetition;
199 },
200 set: function(newVal) {
201 this._transformTracksRepetition = newVal;
202 }
203 },
204 194
205 _tweens:{ 195 _tweens:{
206 value:[] 196 value:[]