From 616ade06c8f669d18c27d27c3ee46a9c844a54ca Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Tue, 26 Jun 2012 08:12:33 -0700
Subject: Timeline Bug fixes

Fix keyframe selection updating stage for sub props.  Fix tween 0 for sub props on re-open.  Fix repetition mismatch for styles and position tracks.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../Timeline/TimelineTrack.reel/TimelineTrack.html  | 21 +++++++++++----------
 .../Timeline/TimelineTrack.reel/TimelineTrack.js    |  1 +
 2 files changed, 12 insertions(+), 10 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 79014ae6..658764c8 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -56,7 +56,7 @@
                    "styleTrackRepetition": {
                        "prototype": "montage/ui/repetition.reel",
                    	   "properties": {
-                   	       "element": {"#": "content-styles"},
+                   	       "element": {"#": "content_style_tracks"},
                    	       "isSelectionEnabled" : false
                    	   },
                    	   "bindings": {
@@ -195,22 +195,23 @@
             </div>
             <div class="label-main collapsible-label collapsible-collapsed" data-montage-id="label-main"></div>
             <div class="collapsible-content collapsible-collapsed content-main" data-montage-id="content-main">
-            	<div class="label-position collapsible-label collapsible-collapsed" data-montage-id="label-position">
 
-                </div>
-                <div class="content-position collapsible-content collapsible-collapsed"
-                     data-montage-id="content_position_collapser">
+            	<div class="label-position collapsible-label collapsible-collapsed" data-montage-id="label-position"></div>
+
+                <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content_position_collapser">
                     <div data-montage-id="content_position_tracks">
                         <div data-montage-id="position_track_base"></div>
                     </div>
                 </div>
 
-            	<div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles">
-            		
-            	</div>
-            	<div data-montage-id="content-styles" class="content-styles collapsible-content collapsible-collapsed">
-            		<div data-montage-id="style-track-base"></div>
+            	<div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles"></div>
+
+            	<div class="content-styles collapsible-content collapsible-collapsed" data-montage-id="content-styles">
+                    <div data-montage-id="content_style_tracks">
+            		    <div data-montage-id="style-track-base"></div>
+                    </div>
             	</div>
+
             </div>
     	</div>
 
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index dc1a5d99..7576b33f 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -969,6 +969,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                             newTween.tweenData.tweenID = 0;
                             newTween.tweenData.spanPosition = 0;
                             this.tweens.push(newTween);
+                            this.createMatchingPositionSizeTween(newTween);
                         }
                         else {
                             tempTiming = trackTiming.split("s");
-- 
cgit v1.2.3