1 files changed, 11 insertions, 23 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index ce52d1f3..350c7311 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -231,9 +231,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);
         }
     },
 
@@ -383,31 +384,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    handleOnOpenDocument:{
-        value:function(){
-            this._boolCacheArrays = false;
-            this.clearTimelinePanel();
-            this._boolCacheArrays = true;
-            this._bindDocumentEvents();
-            
+        handleDocumentChange:{
+                value:function(){
+                        this._boolCacheArrays = false;
+                this.clearTimelinePanel();
+                this._boolCacheArrays = true;
+                this._bindDocumentEvents();
+                
             this.hashInstance = this.createLayerHashTable();
             this.hashElementMapToLayer = this.createElementMapToLayer();
             this.initTimelineForDocument();
         }
     },
-    
-    handleCloseDocument: {
-        value: function(event) {
-            this.clearTimelinePanel();
-        }
-    },
-    
-    handleSwitchDocument : {
-        value: function(event) {
-            // Handle document change.
-            this.handleOnOpenDocument();
-        }
-    },
 
     updateTrackContainerWidth:{
         value: function(){