From 4f1693b953befabf4495df668f542c7f52270864 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Tue, 8 May 2012 13:42:04 -0700 Subject: Change sub property track arrays Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens Signed-off-by: Jonathan Duran --- .../Timeline/TimelineTrack.reel/TimelineTrack.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js') 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, { // delete the current rule this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule); + // first combine all style track tween arrays with the main track tween array + // build the new keyframe string var keyframeString = "@-webkit-keyframes " + this.animationName + " {"; @@ -796,9 +798,14 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { // Init and event handler for layer expand/collapse init:{ value:function () { - - this.arrPositionTracks = [0, 1]; - this.arrTransformTracks = [0, 1, 2, 3, 4]; + + // create track objects for position and transform tracks and push into arrays instead of dummy arrays + + //this.createPositionTracks(); + this.arrPositionTracks = [0, 1, 2, 3]; + + // get rid of transform tracks + //this.arrTransformTracks = [0, 1, 2, 3, 4]; // Register event handler for layer events. defaultEventManager.addEventListener("layerEvent", this, false); @@ -806,6 +813,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { } }, + createPositionTracks:{ + value:function(){ + // create track objects for position and transform tracks and push into arrays + } + }, + handleLayerEvent:{ value:function (layerEvent) { if (layerEvent.layerID !== this.trackID) { -- cgit v1.2.3