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


From 5689e3e2deda1b1f7ba32f6007ddab20f6c1fe64 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 2 Mar 2012 18:17:14 -0800
Subject: Timeline: Serialization of all Collapser components

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 77481ac0..a6b7f9f1 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -121,9 +121,9 @@
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
 	            			"oneway" : false
 	            		},
-	            		"animateCollapser" : {
+	            		"bypassAnimation" : {
 	            			"boundObject" : {"@" : "repetition1"},
-	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
 	            			"oneway" : false
 	            		},
 	            		"dtextPositionX" : {
@@ -241,9 +241,9 @@
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
 	            			"oneway" : false
 	            		},
-	            		"animateCollapser" : {
+	            		"bypassAnimation" : {
 	            			"boundObject" : {"@" : "repetition2"},
-	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
 	            			"oneway" : false
 	            		},
 	            		"isStyleCollapsed" : {
-- 
cgit v1.2.3


From bcfb704b04587f95a13c474cf0598ba90ec3b371 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 6 Mar 2012 18:06:40 -0800
Subject: Timeline: Code cleanup. Fix bug with unfound property in
 serialization.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 5 -----
 1 file changed, 5 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 a6b7f9f1..ae1bcddf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -101,11 +101,6 @@
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
 	            			"oneway" : false
 	            		},
-	            		"animateCollapser" : {
-	            			"boundObject" : {"@" : "repetition1"},
-	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
-	            			"oneway" : false
-	            		},
 	            		"isSelected" : {
 	            			"boundObject" : {"@" : "repetition1"},
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
-- 
cgit v1.2.3