From b7402018659cf8058d5646c08b2a916492269e33 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 23 Feb 2012 07:37:17 -0800
Subject: Timeline Reset to clean Master branch.  Code scrub.

Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../Timeline/TimelineTrack.reel/TimelineTrack.html | 42 +++++++++++++++++-----
 1 file changed, 33 insertions(+), 9 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 b0d191c2..4808e4d8 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -11,7 +11,8 @@
                        "properties": {
                            "element": {"#": "track"},
                            "tweenRepetition" : {"@" : "tweenRepetition"},
-                           "track_lane": {"#": "track_lanes"}
+                           "styleTracksRepetition" : {"@" : "styleTracksRepetition"},
+                           "tween": {"@" : "tween"}
                        }
                    },
 
@@ -37,19 +38,24 @@
                                "boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition",
                                "oneway" : false
                            },
-                           "timelineTrack" : {
+                           "keyFrameMillisec" : {
                                "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.timelineTrack",
+                               "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec",
                                "oneway" : false
                            },
-                           "keyFrameMillisec" : {
+                           "tweenID" : {
                                "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec",
+                               "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenID",
                                "oneway" : false
                            },
-                           "keyframeID" : {
+                           "tweenedProperties" : {
                                "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.keyframeID",
+                               "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenedProperties",
+                               "oneway" : false
+                           },
+                           "isTweenAnimated" : {
+                               "boundObject" : {"@": "tweenRepetition"},
+                               "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated",
                                "oneway" : false
                            }
                        }
@@ -69,7 +75,25 @@
                    	           "oneway": false
                    	       }
                    	   }
+                   },
+
+                   "styleTrackRepetition": {
+                       "module": "montage/ui/repetition.reel",
+                   	   "name": "Repetition",
+                   	   "properties": {
+                   	       "element": {"#": "content-styles"},
+                   	       "isSelectionEnabled" : false
+                   	   },
+                   	   "bindings": {
+                   	       "objects": {
+                   	           "boundObject": {"@": "owner"},
+                   	           "boundObjectPropertyPath": "arrStyleTracks",
+                   	           "oneway": false
+                   	       }
+                   	   }
                    }
+                   
+                   
                }
            </script>
 	</head>
@@ -102,8 +126,8 @@
             	<div class="label-styles collapsible-label collapsible-collapsed">
             		
             	</div>
-            	<div class="content-styles collapsible-content collapsible-collapsed">
-            		
+            	<div id="content-styles" class="content-styles collapsible-content collapsible-collapsed">
+            		<div class="timeline-track"></div>
             	</div>
             </div>
     	</div>
-- 
cgit v1.2.3


From cf671b4855ecca0278128e82459691292a3d3dc9 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 23 Feb 2012 08:08:30 -0800
Subject: Timeline: Create new PropertyTrack subcomponent, and use it in the
 TimelineTrack component.

Cherry pick commit from jreid/Timeline-jreid

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 .../Timeline/TimelineTrack.reel/TimelineTrack.html | 60 ++++++++++++++++++----
 1 file changed, 49 insertions(+), 11 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 4808e4d8..cabd92c0 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -91,7 +91,51 @@
                    	           "oneway": false
                    	       }
                    	   }
-                   }
+                   },
+                   "positionTracksRepetition": {
+                       "module": "montage/ui/repetition.reel",
+                   	   "name": "Repetition",
+                   	   "properties": {
+                   	       "element": {"#": "content-position-tracks"},
+                   	       "isSelectionEnabled" : false
+                   	   },
+                   	   "bindings": {
+                   	       "objects": {
+                   	           "boundObject": {"@": "owner"},
+                   	           "boundObjectPropertyPath": "arrPositionTracks",
+                   	           "oneway": false
+                   	       }
+                   	   }
+                   },
+					"positionPropertyTrack" : {
+						"module" : "js/panels/Timeline/PropertyTrack.reel",
+						"name" : "PropertyTrack",
+						"properties" : {
+							"element":{"#": "position-track-base"}
+						}
+					},
+                   "transformTracksRepetition": {
+                       "module": "montage/ui/repetition.reel",
+                   	   "name": "Repetition",
+                   	   "properties": {
+                   	       "element": {"#": "content-transform-tracks"},
+                   	       "isSelectionEnabled" : false
+                   	   },
+                   	   "bindings": {
+                   	       "objects": {
+                   	           "boundObject": {"@": "owner"},
+                   	           "boundObjectPropertyPath": "arrTransformTracks",
+                   	           "oneway": false
+                   	       }
+                   	   }
+                   },
+					"transformPropertyTrack" : {
+						"module" : "js/panels/Timeline/PropertyTrack.reel",
+						"name" : "PropertyTrack",
+						"properties" : {
+							"element":{"#": "transform-track-base"}
+						}
+					}
                    
                    
                }
@@ -108,20 +152,14 @@
             	<div class="label-position collapsible-label collapsible-collapsed">
             		
             	</div>
-            	<div class="content-position collapsible-content collapsible-collapsed">
-            		<div class="timeline-track"></div>
-            		<div class="timeline-track"></div>
-            		<div class="timeline-track"></div>
+            	<div class="content-position collapsible-content collapsible-collapsed" id="content-position-tracks">
+            		<div id="position-track-base"></div>
             	</div>
             	<div class="label-transform collapsible-label collapsible-collapsed">
             		
             	</div>
-            	<div class="content-transform collapsible-content collapsible-collapsed">
-            		<div class="timeline-track"></div>
-            		<div class="timeline-track"></div>
-            		<div class="timeline-track"></div>
-            		<div class="timeline-track"></div>
-            		<div class="timeline-track"></div>
+            	<div class="content-transform collapsible-content collapsible-collapsed" id="content-transform-tracks">
+            		<div id="transform-track-base"></div>
             	</div>
             	<div class="label-styles collapsible-label collapsible-collapsed">
             		
-- 
cgit v1.2.3


From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 24 Feb 2012 10:20:04 -0800
Subject: Adding some missing copyrights

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 5 +++++
 1 file changed, 5 insertions(+)

(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 cabd92c0..158d666e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,4 +1,9 @@
 <!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
 <html lang="en">
 	<head>
     	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-- 
cgit v1.2.3