1 files changed, 87 insertions, 20 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index b0d191c2..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" />
@@ -11,7 +16,8 @@
                       "properties": {
                           "element": {"#": "track"},
                           "tweenRepetition" : {"@" : "tweenRepetition"},
-                           "track_lane": {"#": "track_lanes"}
+                           "styleTracksRepetition" : {"@" : "styleTracksRepetition"},
+                           "tween": {"@" : "tween"}
                       }
                   },
@@ -37,19 +43,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
+                           },
+                           "tweenedProperties" : {
+                               "boundObject" : {"@": "tweenRepetition"},
+                               "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenedProperties",
                               "oneway" : false
                           },
-                           "keyframeID" : {
+                           "isTweenAnimated" : {
                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.keyframeID",
+                               "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated",
                               "oneway" : false
                           }
                       }
@@ -69,7 +80,69 @@
                                   "oneway": false
                               }
                           }
-                   }
+                   },
+                   "styleTrackRepetition": {
+                       "module": "montage/ui/repetition.reel",
+                           "name": "Repetition",
+                           "properties": {
+                               "element": {"#": "content-styles"},
+                               "isSelectionEnabled" : false
+                           },
+                           "bindings": {
+                               "objects": {
+                                   "boundObject": {"@": "owner"},
+                                   "boundObjectPropertyPath": "arrStyleTracks",
+                                   "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"}
+                                                }
+                                        }
+                   
+                   
               }
           </script>
        </head>
@@ -84,26 +157,20 @@
                <div class="label-position collapsible-label collapsible-collapsed">
                        
                </div>
-                <div class="content-position collapsible-content collapsible-collapsed">
+                <div class="content-position collapsible-content collapsible-collapsed" id="content-position-tracks">
-                        <div class="timeline-track"></div>
+                        <div id="position-track-base"></div>
-                        <div class="timeline-track"></div>
-                        <div class="timeline-track"></div>
                </div>
                <div class="label-transform collapsible-label collapsible-collapsed">
                        
                </div>
-                <div class="content-transform collapsible-content collapsible-collapsed">
+                <div class="content-transform collapsible-content collapsible-collapsed" id="content-transform-tracks">
-                        <div class="timeline-track"></div>
+                        <div id="transform-track-base"></div>
-                        <div class="timeline-track"></div>
-                        <div class="timeline-track"></div>
-                        <div class="timeline-track"></div>
-                        <div class="timeline-track"></div>
                </div>
                <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>

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index b0d191c2..158d666e 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,4 +1,9 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
		2	<!-- <copyright>
		3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
		4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
		5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
		6	</copyright> -->
2	<html lang="en">	7	<html lang="en">
3	<head>	8	<head>
4	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -11,7 +16,8 @@
11	"properties": {	16	"properties": {
12	"element": {"#": "track"},	17	"element": {"#": "track"},
13	"tweenRepetition" : {"@" : "tweenRepetition"},	18	"tweenRepetition" : {"@" : "tweenRepetition"},
14	"track_lane": {"#": "track_lanes"}	19	"styleTracksRepetition" : {"@" : "styleTracksRepetition"},
		20	"tween": {"@" : "tween"}
15	}	21	}
16	},	22	},
17		23
@@ -37,19 +43,24 @@
37	"boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition",	43	"boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition",
38	"oneway" : false	44	"oneway" : false
39	},	45	},
40	"timelineTrack" : {	46	"keyFrameMillisec" : {
41	"boundObject" : {"@": "tweenRepetition"},	47	"boundObject" : {"@": "tweenRepetition"},
42	"boundObjectPropertyPath" : "objectAtCurrentIteration.timelineTrack",	48	"boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec",
43	"oneway" : false	49	"oneway" : false
44	},	50	},
45	"keyFrameMillisec" : {	51	"tweenID" : {
46	"boundObject" : {"@": "tweenRepetition"},	52	"boundObject" : {"@": "tweenRepetition"},
47	"boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec",	53	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenID",
		54	"oneway" : false
		55	},
		56	"tweenedProperties" : {
		57	"boundObject" : {"@": "tweenRepetition"},
		58	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenedProperties",
48	"oneway" : false	59	"oneway" : false
49	},	60	},
50	"keyframeID" : {	61	"isTweenAnimated" : {
51	"boundObject" : {"@": "tweenRepetition"},	62	"boundObject" : {"@": "tweenRepetition"},
52	"boundObjectPropertyPath" : "objectAtCurrentIteration.keyframeID",	63	"boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated",
53	"oneway" : false	64	"oneway" : false
54	}	65	}
55	}	66	}
@@ -69,7 +80,69 @@
69	"oneway": false	80	"oneway": false
70	}	81	}
71	}	82	}
72	}	83	},
		84
		85	"styleTrackRepetition": {
		86	"module": "montage/ui/repetition.reel",
		87	"name": "Repetition",
		88	"properties": {
		89	"element": {"#": "content-styles"},
		90	"isSelectionEnabled" : false
		91	},
		92	"bindings": {
		93	"objects": {
		94	"boundObject": {"@": "owner"},
		95	"boundObjectPropertyPath": "arrStyleTracks",
		96	"oneway": false
		97	}
		98	}
		99	},
		100	"positionTracksRepetition": {
		101	"module": "montage/ui/repetition.reel",
		102	"name": "Repetition",
		103	"properties": {
		104	"element": {"#": "content-position-tracks"},
		105	"isSelectionEnabled" : false
		106	},
		107	"bindings": {
		108	"objects": {
		109	"boundObject": {"@": "owner"},
		110	"boundObjectPropertyPath": "arrPositionTracks",
		111	"oneway": false
		112	}
		113	}
		114	},
		115	"positionPropertyTrack" : {
		116	"module" : "js/panels/Timeline/PropertyTrack.reel",
		117	"name" : "PropertyTrack",
		118	"properties" : {
		119	"element":{"#": "position-track-base"}
		120	}
		121	},
		122	"transformTracksRepetition": {
		123	"module": "montage/ui/repetition.reel",
		124	"name": "Repetition",
		125	"properties": {
		126	"element": {"#": "content-transform-tracks"},
		127	"isSelectionEnabled" : false
		128	},
		129	"bindings": {
		130	"objects": {
		131	"boundObject": {"@": "owner"},
		132	"boundObjectPropertyPath": "arrTransformTracks",
		133	"oneway": false
		134	}
		135	}
		136	},
		137	"transformPropertyTrack" : {
		138	"module" : "js/panels/Timeline/PropertyTrack.reel",
		139	"name" : "PropertyTrack",
		140	"properties" : {
		141	"element":{"#": "transform-track-base"}
		142	}
		143	}
		144
		145
73	}	146	}
74	</script>	147	</script>
75	</head>	148	</head>
@@ -84,26 +157,20 @@
84	<div class="label-position collapsible-label collapsible-collapsed">	157	<div class="label-position collapsible-label collapsible-collapsed">
85		158
86	</div>	159	</div>
87	<div class="content-position collapsible-content collapsible-collapsed">	160	<div class="content-position collapsible-content collapsible-collapsed" id="content-position-tracks">
88	<div class="timeline-track"></div>	161	<div id="position-track-base"></div>
89	<div class="timeline-track"></div>
90	<div class="timeline-track"></div>
91	</div>	162	</div>
92	<div class="label-transform collapsible-label collapsible-collapsed">	163	<div class="label-transform collapsible-label collapsible-collapsed">
93		164
94	</div>	165	</div>
95	<div class="content-transform collapsible-content collapsible-collapsed">	166	<div class="content-transform collapsible-content collapsible-collapsed" id="content-transform-tracks">
96	<div class="timeline-track"></div>	167	<div id="transform-track-base"></div>
97	<div class="timeline-track"></div>
98	<div class="timeline-track"></div>
99	<div class="timeline-track"></div>
100	<div class="timeline-track"></div>
101	</div>	168	</div>
102	<div class="label-styles collapsible-label collapsible-collapsed">	169	<div class="label-styles collapsible-label collapsible-collapsed">
103		170
104	</div>	171	</div>
105	<div class="content-styles collapsible-content collapsible-collapsed">	172	<div id="content-styles" class="content-styles collapsible-content collapsible-collapsed">
106		173	<div class="timeline-track"></div>
107	</div>	174	</div>
108	</div>	175	</div>
109	</div>	176	</div>