aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorJon Reid2012-07-16 09:20:10 -0700
committerJon Reid2012-07-16 09:20:10 -0700
commit15edcb5fe22793aab024c1ef7dde109b36977dd8 (patch)
tree48d884ad0a48ac5dabf9acfcb844a9dbe63bec28 /js/panels/Timeline/TimelinePanel.reel
parent3bea1cb3fb53bac17daa31f4b5cf561fbd040dda (diff)
downloadninja-15edcb5fe22793aab024c1ef7dde109b36977dd8.tar.gz
Timeline: Disable drag-and-drop on subproperty keyframes. Better error
handling. Fix some minor bugs.
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 93b4d67e..c790466c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -979,9 +979,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
979 this.layout_tracks = this.element.querySelector(".layout-tracks"); 979 this.layout_tracks = this.element.querySelector(".layout-tracks");
980 this.layout_markers = this.element.querySelector(".layout_markers"); 980 this.layout_markers = this.element.querySelector(".layout_markers");
981 981
982 // Bind the event handler for the document close events
983 this.eventManager.addEventListener("closeDocument", this.handleDocumentChange.bind(this), false);
984
985 // Bind drag and drop event handlers 982 // Bind drag and drop event handlers
986 this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false); 983 this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false);
987 this.container_layers.addEventListener("dragend", this.handleLayerDragEnd.bind(this), false); 984 this.container_layers.addEventListener("dragend", this.handleLayerDragEnd.bind(this), false);
@@ -1628,12 +1625,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1628 } 1625 }
1629 }, 1626 },
1630 1627
1631 handleDocumentChange:{
1632 value:function () {
1633
1634 }
1635 },
1636
1637 handlePlayButtonClick:{ 1628 handlePlayButtonClick:{
1638 value:function(ev){ 1629 value:function(ev){
1639 this.application.ninja.appModel.livePreview = !this.application.ninja.appModel.livePreview; 1630 this.application.ninja.appModel.livePreview = !this.application.ninja.appModel.livePreview;