11 files changed, 1020 insertions, 247 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css
deleted file mode 100644
index 7f1b0f7f..00000000
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* <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> */
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 6849898b..9ed69f4a 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,32 +1,225 @@
 <!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" />
-        <link rel="stylesheet" type="text/css" href="TimelinePanel.css">
+        <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css">
+                
        <script type="text/montage-serialization">
-               {
+            {
-                   "owner": {
+                "owner": {
-                       "module": "js/panels/Timeline/TimelinePanel.reel",
+                    "module": "js/panels/Timeline/TimelinePanel.reel",
-                       "name": "TimelinePanel",
+                    "name": "TimelinePanel",
-                       "properties": {
+                    "properties": {
-                           "element": {"#": "timeline_panel"}
+                        "element": {"#": "timeline_panel"},
-                       }
+                        "user_layers": {"#": "user_layers"},
-                   }
+                        "track_container": {"#": "right_inside"},
+                        "layer_tracks": {"#": "layer_tracks"},
-               }
+                        "master_track": {"#": "master_track"},
-        </script>
+                        "newlayer_button": {"#": "newlayer_button"},
+                        "deletelayer_button": {"#": "deletelayer_button"},
+                        "time_markers" : {"#": "timeline_markers"},
+                        "layerRepetition" : {"@": "repetition1"},
+                        "trackRepetition" : {"@" : "repetition2"},
+                        "playhead": {"#": "playhead"},
+                        "playheadmarker": {"#": "playhead_marker"},
+                        "timetext" : {"#": "time_text"}
+                    }
+                },
+                "timelineResize" : {
+                    "module": "js/panels/Resizer",
+                    "name": "Resizer",
+                    "properties": {
+                        "element": {"#": "layer_resizer"},
+                        "panel" : {"#" : "timeline_leftpane"},
+                        "isVertical" : false,
+                        "isInversed" : false,
+                        "isPanel"    : false
+                    }
+                },
+                
+                    "repetition1": {
+                        "module": "montage/ui/repetition.reel",
+                        "name": "Repetition",
+                        "properties": {
+                            "element": {"#": "container-layers"},
+                            "isSelectionEnabled" : true
+                        },
+                        "bindings": {
+                            "objects": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "arrLayers",
+                                "oneway": false
+                            }
+                        }
+                    },
+                    "layer" : {
+                        "module" : "js/panels/Timeline/Layer.reel",
+                        "name" : "Layer",
+                        "properties" : {
+                                "element": {"#": "container-layer"}
+                        },
+                        "bindings" : {
+                                "layerName" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.layerName",
+                                        "oneway" : false
+                                },
+                                "layerID" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID",
+                                        "oneway" : false
+                                },
+                                "arrLayerStyles" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.arrLayerStyles",
+                                        "oneway" : false
+                                },
+                                "isMainCollapsed" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
+                                        "oneway" : false
+                                },
+                                "isPositionCollapsed" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed",
+                                        "oneway" : false
+                                },
+                                "isTransformCollapsed" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
+                                        "oneway" : false
+                                },
+                                "isStyleCollapsed" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
+                                        "oneway" : false
+                                }
+                        }
+                    },
+                    
+                    "repetition2" : {
+                        "module": "montage/ui/repetition.reel",
+                        "name": "Repetition",
+                        "properties": {
+                            "element": {"#": "container-tracks"},
+                            "isSelectionEnabled" : false
+                        },
+                        "bindings": {
+                            "objects": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "arrTracks",
+                                "oneway": false
+                            }
+                        }
+                    },
+                    "track" : {
+                        "module" : "js/panels/Timeline/TimelineTrack.reel",
+                        "name" : "TimelineTrack",
+                        "properties" : {
+                                "element": {"#": "container-track"}
+                        },
+                        "bindings" : {
+                                "trackID" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.trackID",
+                                        "oneway" : false
+                                },
+                                "tweens" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens",
+                                        "oneway" : false
+                                },
+                                "isMainCollapsed" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
+                                        "oneway" : false
+                                },
+                                "isPositionCollapsed" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed",
+                                        "oneway" : false
+                                },
+                                "isTransformCollapsed" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
+                                        "oneway" : false
+                                },
+                                "isStyleCollapsed" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
+                                        "oneway" : false
+                                }
+                        }
+                    }
+            }
+        </script>
        </head>
        <body>

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css deleted file mode 100644 index 7f1b0f7f..00000000 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css +++ /dev/null
@@ -1,6 +0,0 @@
1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */
6


diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 6849898b..9ed69f4a 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,32 +1,225 @@
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> -->
7	<html lang="en">	2	<html lang="en">
8	<head>	3	<head>
9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	4	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
10	<link rel="stylesheet" type="text/css" href="TimelinePanel.css">	5	<link rel="stylesheet" type="text/css" href="css/TimelinePanel.css">
		6
		7
11	<script type="text/montage-serialization">	8	<script type="text/montage-serialization">
12	{	9	{
13	"owner": {	10	"owner": {
14	"module": "js/panels/Timeline/TimelinePanel.reel",	11	"module": "js/panels/Timeline/TimelinePanel.reel",
15	"name": "TimelinePanel",	12	"name": "TimelinePanel",
16	"properties": {	13	"properties": {
17	"element": {"#": "timeline_panel"}	14	"element": {"#": "timeline_panel"},
18	}	15	"user_layers": {"#": "user_layers"},
19	}	16	"track_container": {"#": "right_inside"},
20		17	"layer_tracks": {"#": "layer_tracks"},
21	}	18	"master_track": {"#": "master_track"},
22	</script>	19	"newlayer_button": {"#": "newlayer_button"},
		20	"deletelayer_button": {"#": "deletelayer_button"},
		21	"time_markers" : {"#": "timeline_markers"},
		22	"layerRepetition" : {"@": "repetition1"},
		23	"trackRepetition" : {"@" : "repetition2"},
		24	"playhead": {"#": "playhead"},
		25	"playheadmarker": {"#": "playhead_marker"},
		26	"timetext" : {"#": "time_text"}
		27	}
		28	},
23		29
		30	"timelineResize" : {
		31	"module": "js/panels/Resizer",
		32	"name": "Resizer",
		33	"properties": {
		34	"element": {"#": "layer_resizer"},
		35	"panel" : {"#" : "timeline_leftpane"},
		36	"isVertical" : false,
		37	"isInversed" : false,
		38	"isPanel" : false
		39	}
		40	},
		41
		42
		43	"repetition1": {
		44	"module": "montage/ui/repetition.reel",
		45	"name": "Repetition",
		46	"properties": {
		47	"element": {"#": "container-layers"},
		48	"isSelectionEnabled" : true
		49	},
		50	"bindings": {
		51	"objects": {
		52	"boundObject": {"@": "owner"},
		53	"boundObjectPropertyPath": "arrLayers",
		54	"oneway": false
		55	}
		56	}
		57	},
		58	"layer" : {
		59	"module" : "js/panels/Timeline/Layer.reel",
		60	"name" : "Layer",
		61	"properties" : {
		62	"element": {"#": "container-layer"}
		63	},
		64	"bindings" : {
		65	"layerName" : {
		66	"boundObject" : {"@" : "repetition1"},
		67	"boundObjectPropertyPath" : "objectAtCurrentIteration.layerName",
		68	"oneway" : false
		69	},
		70	"layerID" : {
		71	"boundObject" : {"@" : "repetition1"},
		72	"boundObjectPropertyPath" : "objectAtCurrentIteration.layerID",
		73	"oneway" : false
		74	},
		75	"arrLayerStyles" : {
		76	"boundObject" : {"@" : "repetition1"},
		77	"boundObjectPropertyPath" : "objectAtCurrentIteration.arrLayerStyles",
		78	"oneway" : false
		79	},
		80	"isMainCollapsed" : {
		81	"boundObject" : {"@" : "repetition1"},
		82	"boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
		83	"oneway" : false
		84	},
		85	"isPositionCollapsed" : {
		86	"boundObject" : {"@" : "repetition1"},
		87	"boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed",
		88	"oneway" : false
		89	},
		90	"isTransformCollapsed" : {
		91	"boundObject" : {"@" : "repetition1"},
		92	"boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
		93	"oneway" : false
		94	},
		95	"isStyleCollapsed" : {
		96	"boundObject" : {"@" : "repetition1"},
		97	"boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
		98	"oneway" : false
		99	}
		100	}
		101	},
		102
		103	"repetition2" : {
		104	"module": "montage/ui/repetition.reel",
		105	"name": "Repetition",
		106	"properties": {
		107	"element": {"#": "container-tracks"},
		108	"isSelectionEnabled" : false
		109	},
		110	"bindings": {
		111	"objects": {
		112	"boundObject": {"@": "owner"},
		113	"boundObjectPropertyPath": "arrTracks",
		114	"oneway": false
		115	}
		116	}
		117	},
		118	"track" : {
		119	"module" : "js/panels/Timeline/TimelineTrack.reel",
		120	"name" : "TimelineTrack",
		121	"properties" : {
		122	"element": {"#": "container-track"}
		123	},
		124	"bindings" : {
		125	"trackID" : {
		126	"boundObject" : {"@" : "repetition2"},
		127	"boundObjectPropertyPath" : "objectAtCurrentIteration.trackID",
		128	"oneway" : false
		129	},
		130	"tweens" : {
		131	"boundObject" : {"@" : "repetition2"},
		132	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweens",
		133	"oneway" : false
		134	},
		135	"isMainCollapsed" : {
		136	"boundObject" : {"@" : "repetition2"},
		137	"boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
		138	"oneway" : false
		139	},
		140	"isPositionCollapsed" : {
		141	"boundObject" : {"@" : "repetition2"},
		142	"boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed",
		143	"oneway" : false
		144	},
		145	"isTransformCollapsed" : {
		146	"boundObject" : {"@" : "repetition2"},
		147	"boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
		148	"oneway" : false
		149	},
		150	"isStyleCollapsed" : {
		151	"boundObject" : {"@" : "repetition2"},
		152	"boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
		153	"oneway" : false
		154	}
		155	}
		156	}
		157	}
		158	</script>
24		159
25	</head>	160	</head>
26	<body>	161	<body>
27