From 40670fd9a723fe6f95fe6c1ceefa0d2435b83aa4 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 9 May 2012 09:47:31 -0700
Subject: sub property additions

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../Timeline/TimelineTrack.reel/TimelineTrack.html |  9 +++++-
 .../Timeline/TimelineTrack.reel/TimelineTrack.js   | 37 ++++++++++++++++++++--
 2 files changed, 43 insertions(+), 3 deletions(-)

(limited to 'js/panels/Timeline/TimelineTrack.reel')

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 3f3bf24a..b666f921 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -98,7 +98,14 @@
 						"prototype" : "js/panels/Timeline/PropertyTrack.reel",
 						"properties" : {
 							"element":{"#": "position-track-base"}
-						}
+						},
+                        "bindings" : {
+                            "propTrackData" : {
+                                 "boundObject" : {"@" : "positionTracksRepetition"},
+                                 "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData",
+                                 "oneway" : false
+                            }
+                        }
 					},
 					
 					"mainCollapser" : {
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 891feada..2ce1a637 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -801,8 +801,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
             // create track objects for position and transform tracks and push into arrays instead of dummy arrays
 
-            //this.createPositionTracks();
-            this.arrPositionTracks = [0, 1, 2, 3];
+            this.createPositionTracks();
+            //this.arrPositionTracks = [0, 1, 2, 3];
 
             // get rid of transform tracks
             //this.arrTransformTracks = [0, 1, 2, 3, 4];
@@ -816,6 +816,38 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     createPositionTracks:{
         value:function(){
             // create track objects for position and transform tracks and push into arrays
+
+            // create 'top' track
+            var newTopTrack = {};
+            newTopTrack.propTrackData = {};
+            newTopTrack.propTrackData.propTweens = [];
+            newTopTrack.propTrackData.styleIndex = 0;
+            newTopTrack.propTrackData.trackType = "position";
+            this.arrPositionTracks.push(newTopTrack);
+
+            // create 'left' track
+            var newLeftTrack = {};
+            newLeftTrack.propTrackData = {};
+            newLeftTrack.propTrackData.propTweens = [];
+            newLeftTrack.propTrackData.styleIndex = 1;
+            newLeftTrack.propTrackData.trackType = "position";
+            this.arrPositionTracks.push(newLeftTrack);
+
+            // create 'width' track
+            var newWidthTrack = {};
+            newWidthTrack.propTrackData = {};
+            newWidthTrack.propTrackData.propTweens = [];
+            newWidthTrack.propTrackData.styleIndex = 2;
+            newWidthTrack.propTrackData.trackType = "position";
+            this.arrPositionTracks.push(newWidthTrack);
+
+            // create 'height' track
+            var newHeightTrack = {};
+            newHeightTrack.propTrackData = {};
+            newHeightTrack.propTrackData.propTweens = [];
+            newHeightTrack.propTrackData.styleIndex = 3;
+            newHeightTrack.propTrackData.trackType = "position";
+            this.arrPositionTracks.push(newHeightTrack);
         }
     },
 
@@ -831,6 +863,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 newStyleTrack.propTrackData = {};
                 newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection;
                 newStyleTrack.propTrackData.propTweens = [];
+                newStyleTrack.propTrackData.trackType = "style";
                 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex;
 
                 console.log(layerEvent.styleIndex);
-- 
cgit v1.2.3