aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorKruti Shah2012-07-16 16:28:57 -0700
committerKruti Shah2012-07-16 16:28:57 -0700
commit7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (patch)
treea1c0985f584273990dcacdfaf9aeaddeb583d0b1 /js/panels/Timeline/TimelinePanel.reel
parentcdcc677c827b65e3c689d4207c0117f94e4d6d57 (diff)
parent33e54da07d024ece1d52041d4ed2bcc28b8cbca3 (diff)
downloadninja-7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js9
1 files changed, 0 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 0bf025ab..981ddc22 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -985,9 +985,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
985 this.layout_tracks = this.element.querySelector(".layout-tracks"); 985 this.layout_tracks = this.element.querySelector(".layout-tracks");
986 this.layout_markers = this.element.querySelector(".layout_markers"); 986 this.layout_markers = this.element.querySelector(".layout_markers");
987 987
988 // Bind the event handler for the document close events
989 this.eventManager.addEventListener("closeDocument", this.handleDocumentChange.bind(this), false);
990
991 // Bind drag and drop event handlers 988 // Bind drag and drop event handlers
992 this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false); 989 this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false);
993 this.container_layers.addEventListener("dragend", this.handleLayerDragEnd.bind(this), false); 990 this.container_layers.addEventListener("dragend", this.handleLayerDragEnd.bind(this), false);
@@ -1634,12 +1631,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1634 } 1631 }
1635 }, 1632 },
1636 1633
1637 handleDocumentChange:{
1638 value:function () {
1639
1640 }
1641 },
1642
1643 handlePlayButtonClick:{ 1634 handlePlayButtonClick:{
1644 value:function(ev){ 1635 value:function(ev){
1645 this.application.ninja.appModel.livePreview = !this.application.ninja.appModel.livePreview; 1636 this.application.ninja.appModel.livePreview = !this.application.ninja.appModel.livePreview;