From 54fd77320dcce93987c138923bcb8a9b9899c4c0 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 3 May 2012 23:09:48 -0700
Subject: apply old stash to new branch

initial work and stubs for sub property support.  serialization for property track components and classes

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 44ad9abb..3936328e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -52,7 +52,6 @@
                    	       }
                    	   }
                    },
-
                    "styleTrackRepetition": {
                        "prototype": "montage/ui/repetition.reel",
                    	   "properties": {
@@ -67,6 +66,12 @@
                    	       }
                    	   }
                    },
+                   "stylePropertyTrack" : {
+               	        "prototype" : "js/panels/Timeline/PropertyTrack.reel",
+               			"properties" : {
+               				"element":{"#": "style-track-base"}
+               			}
+               	   },
                    "positionTracksRepetition": {
                        "prototype": "montage/ui/repetition.reel",
                    	   "properties": {
@@ -236,7 +241,7 @@
             		
             	</div>
             	<div data-montage-id="content-styles" class="content-styles collapsible-content collapsible-collapsed">
-            		<div class="timeline-track"></div>
+            		<div data-montage-id="style-track-base"></div>
             	</div>
             </div>
     	</div>
-- 
cgit v1.2.3