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')

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 f14bc1ace048e46cbcb7148dbe37a5d2065a3779 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 24 Feb 2012 17:26:08 -0800
Subject: Timeline: Add grids to property tracks. First take on clearTimeline
 method on TimelinePanel class.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 5f484cdb..2143dafd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -242,6 +242,24 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             _firstLayerDraw = true;
         }
     },
+    
+    clearTimelinePanel : {
+    	value: function() {
+    		console.log('clearing timeline...')
+    		this.arrTracks = null;
+    		this.arrLayers = null;
+    		this.currentLayerNumber = 0;
+    		this.currentLayerSelected = null;
+    		this.currentTrackSelected = null;
+    		this.selectedKeyframes = [];
+    		this.selectedTweens = [];
+    		this._captureSelection = false;
+    		this._openDoc = false;
+    		this.end_hottext.value = 25;
+    		this.updateTrackContainerWidth();
+    		this.needsDraw = true;
+    	}
+    },
 
     updateTrackContainerWidth:{
         value: function(){
-- 
cgit v1.2.3