From ec5f81c6c0ccf865505ab82ebf9240c667f05c91 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 27 Feb 2012 12:07:30 -0800
Subject: Timeline: further work on clearTimeline method.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 9d0b8210..65d2fa7b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,7 +32,8 @@
                         "timetext" : {"#": "time_text"},
                         "timebar" : {"#": "time_bar"},
                         "container_tracks" : {"#" : "container-tracks"},
-                        "end_hottext" : {"@" : "endHottext"}
+                        "end_hottext" : {"@" : "endHottext"},
+                        "getme" : {"#" : "getme"}
                     }
                 },
 
@@ -284,7 +285,7 @@
                         
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
-                                <div>Master Layer</div>
+                                <div id="getme">Master Layer</div>
                             </div>
                             <div id="container-layers">
                             	<div id="container-layer"></div>
-- 
cgit v1.2.3


From 939cb7eccb8a5ec655fbde8b470894d293832307 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 1 Mar 2012 09:21:50 -0800
Subject: Timeline: Document switching and code restructuring.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 1aa9a725..92adee05 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,8 +32,7 @@
                         "timetext" : {"#": "time_text"},
                         "timebar" : {"#": "time_bar"},
                         "container_tracks" : {"#" : "container-tracks"},
-                        "end_hottext" : {"@" : "endHottext"},
-                        "getme" : {"#" : "getme"}
+                        "end_hottext" : {"@" : "endHottext"}
                     }
                 },
 
@@ -285,7 +284,7 @@
                         
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
-                                <div id="getme">Master Layer</div>
+                                <div>Master Layer</div>
                             </div>
                             <div id="container-layers">
                             	<div id="container-layer"></div>
-- 
cgit v1.2.3


From 205d869d94005cb214fd838879d4f5e81d763311 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 1 Mar 2012 18:01:08 -0800
Subject: Timeline: Merge arrlayers and arrtracks into one object. Redefine
 collapser to use property binding instead of events.

---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 92adee05..77481ac0 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -101,6 +101,11 @@
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
 	            			"oneway" : false
 	            		},
+	            		"animateCollapser" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+	            			"oneway" : false
+	            		},
 	            		"isSelected" : {
 	            			"boundObject" : {"@" : "repetition1"},
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
@@ -116,6 +121,11 @@
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
 	            			"oneway" : false
 	            		},
+	            		"animateCollapser" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+	            			"oneway" : false
+	            		},
 	            		"dtextPositionX" : {
 	            			"boundObject" : {"@" : "repetition1"},
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
@@ -164,7 +174,7 @@
 	                "bindings": {
 	                    "objects": {
 	                        "boundObject": {"@": "owner"},
-	                        "boundObjectPropertyPath": "arrTracks",
+	                        "boundObjectPropertyPath": "arrLayers",
 	                        "oneway": false
 	                    }
 	                }
@@ -178,7 +188,7 @@
 	            	"bindings" : {
 	            		"trackID" : {
 	            			"boundObject" : {"@" : "repetition2"},
-	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.trackID",
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.layerID",
 	            			"oneway" : false
 	            		},
 	            		"tweens" : {
@@ -231,6 +241,11 @@
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
 	            			"oneway" : false
 	            		},
+	            		"animateCollapser" : {
+	            			"boundObject" : {"@" : "repetition2"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+	            			"oneway" : false
+	            		},
 	            		"isStyleCollapsed" : {
 	            			"boundObject" : {"@" : "repetition2"},
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
-- 
cgit v1.2.3