From 0b18fb2fef124a26204d5dba90cd82c975b69df3 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 23 Feb 2012 17:06:48 -0800
Subject: Timeline: Add hottext fields to layers and serialize them throughout.

---
 .../Timeline/TimelinePanel.reel/TimelinePanel.html | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(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 33145028..c964936c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -110,6 +110,41 @@
 	            			"boundObject" : {"@" : "repetition1"},
 	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
 	            			"oneway" : false
+	            		},
+	            		"dtextPositionX" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
+	            			"oneway" : false
+	            		},
+	            		"dtextPositionY" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionY",
+	            			"oneway" : false
+	            		},
+	            		"dtextSkewX" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewX",
+	            			"oneway" : false
+	            		},
+	            		"dtextSkewY" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewY",
+	            			"oneway" : false
+	            		},
+	            		"dtextScaleX" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleX",
+	            			"oneway" : false
+	            		},
+	            		"dtextScaleY" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleY",
+	            			"oneway" : false
+	            		},
+	            		"dtextRotate" : {
+	            			"boundObject" : {"@" : "repetition1"},
+	            			"boundObjectPropertyPath" : "objectAtCurrentIteration.dtextRotate",
+	            			"oneway" : false
 	            		}
 	            	}
 	            },
-- 
cgit v1.2.3


From f97080989ee988c1e613915c2d246dc17b104b3b Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 24 Feb 2012 13:27:33 -0800
Subject: clearing the old local setting and using the new version/prefix local
 settings.

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

(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 0c302436..0fd5b05d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -264,7 +264,7 @@
                     </div>
                 </div>
 
-                <div id="layer_resizer" class="layerresizer"></div>
+                <div data-montage-id="layer_resizer" class="layerresizer"></div>
 
                 <div id="timeline_rightpane" class="tl_rightpane">
                     <div id="right_inside" class="rightinside">
-- 
cgit v1.2.3


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