Merge branch 'refs/heads/Timeline-local' into Timeline

2 files changed, 53 insertions, 0 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 0c302436..9d0b8210 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -115,6 +115,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
                                 }
                         }
                     },
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(){