From b42e5dc5922fb427b9edc7af60e9fa4a5dfcbe0e Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 10 May 2012 10:43:49 -0700
Subject: Some sub prop updates

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js                |  2 +-
 .../Timeline/PropertyTrack.reel/PropertyTrack.js      |  4 +---
 .../Timeline/TimelineTrack.reel/TimelineTrack.js      | 19 +++++--------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 9fb33956..245aabd4 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -60,7 +60,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     	}
     },
     _styleCounter : {
-    	value: 4
+    	value: 0
     },
     styleCounter:{
         serializable:true,
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 8316540b..4f798f36 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -146,6 +146,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             this.styleIndex = this.propTrackData.styleIndex;
             this.propTweens = this.propTrackData.propTweens;
             this.trackType = this.propTrackData.trackType;
+            this.trackEditorProperty = this.propTrackData.trackEditorProperty;
             this.needsDraw = true;
         }
     },
@@ -170,12 +171,9 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                         }
                     } else if (this.trackType === "position") {
                         console.log("clicking on position track");
-
                         console.log(this.trackEditorProperty);
                     }
 
-
-
                     this.insertPropTween(0);
                     this.addPropAnimationRuleToElement(ev);
                     this.updatePropKeyframeRule();
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 2ce1a637..a1b1ce74 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -501,11 +501,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 	            	}
 	            }
     		}
-            
-            
-            
-            
-            
 
         }
     },
@@ -798,18 +793,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     // Init and event handler for layer expand/collapse
     init:{
         value:function () {
-
-            // 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);
-
         }
     },
 
@@ -823,6 +809,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             newTopTrack.propTrackData.propTweens = [];
             newTopTrack.propTrackData.styleIndex = 0;
             newTopTrack.propTrackData.trackType = "position";
+            newTopTrack.propTrackData.trackEditorProperty = "top";
             this.arrPositionTracks.push(newTopTrack);
 
             // create 'left' track
@@ -831,6 +818,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             newLeftTrack.propTrackData.propTweens = [];
             newLeftTrack.propTrackData.styleIndex = 1;
             newLeftTrack.propTrackData.trackType = "position";
+            newLeftTrack.propTrackData.trackEditorProperty = "left";
             this.arrPositionTracks.push(newLeftTrack);
 
             // create 'width' track
@@ -839,6 +827,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             newWidthTrack.propTrackData.propTweens = [];
             newWidthTrack.propTrackData.styleIndex = 2;
             newWidthTrack.propTrackData.trackType = "position";
+            newWidthTrack.propTrackData.trackEditorProperty = "width";
             this.arrPositionTracks.push(newWidthTrack);
 
             // create 'height' track
@@ -847,6 +836,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             newHeightTrack.propTrackData.propTweens = [];
             newHeightTrack.propTrackData.styleIndex = 3;
             newHeightTrack.propTrackData.trackType = "position";
+            newHeightTrack.propTrackData.trackEditorProperty = "height";
             this.arrPositionTracks.push(newHeightTrack);
         }
     },
@@ -864,6 +854,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection;
                 newStyleTrack.propTrackData.propTweens = [];
                 newStyleTrack.propTrackData.trackType = "style";
+                newStyleTrack.propTrackData.trackEditorProperty = "";
                 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex;
 
                 console.log(layerEvent.styleIndex);
-- 
cgit v1.2.3