1 files changed, 5 insertions, 17 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 0185d448..cd7622b1 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -217,9 +217,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     prepareForDraw:{
         value:function () {
             this.initTimeline();
-            this.eventManager.addEventListener("onOpenDocument", this, false);
-            this.eventManager.addEventListener("closeDocument", this, false);
-            this.eventManager.addEventListener("switchDocument", this, false);
+            // Bind the event handler for the document change events
+                        this.eventManager.addEventListener("onOpenDocument", this.handleDocumentChange.bind(this), false);
+            this.eventManager.addEventListener("closeDocument", this.handleDocumentChange.bind(this), false);
+            this.eventManager.addEventListener("switchDocument", this.handleDocumentChange.bind(this), false);
         }
     },
 
@@ -368,7 +369,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-        handleOnOpenDocument:{
+        handleDocumentChange:{
                 value:function(){
                         this._boolCacheArrays = false;
                 this.clearTimelinePanel();
@@ -380,19 +381,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.initTimelineForDocument();
         }
     },
-    
-    handleCloseDocument: {
-        value: function(event) {
-                this.clearTimelinePanel();
-        }
-    },
-    
-    handleSwitchDocument : {
-        value: function(event) {
-                // Handle document change.
-                this.handleOnOpenDocument();
-        }
-    },
 
     updateTrackContainerWidth:{
         value: function(){