diff options
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 11 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index df1a25a8..10097805 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -469,9 +469,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
469 | }, | 469 | }, |
470 | 470 | ||
471 | // Bind all document-specific events (pass in true to unbind) | 471 | // Bind all document-specific events (pass in true to unbind) |
472 | _bindDocumentEvents:{ | 472 | _bindDocumentEvents : { |
473 | value:function (boolUnbind) { | 473 | value: function(boolUnbind) { |
474 | var arrEvents = ["elementAdded", "elementDeleted", "selectionChange"], | 474 | var arrEvents = ["deleteLayerClick", |
475 | "newLayer", | ||
476 | "deleteLayer", | ||
477 | "elementAdded", | ||
478 | "elementsRemoved", | ||
479 | "selectionChange"], | ||
475 | i, | 480 | i, |
476 | arrEventsLength = arrEvents.length; | 481 | arrEventsLength = arrEvents.length; |
477 | 482 | ||
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 27828c3c..5410c77c 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -169,7 +169,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
169 | 169 | ||
170 | if (event.detail.source && event.detail.source !== "tween") { | 170 | if (event.detail.source && event.detail.source !== "tween") { |
171 | // check for correct element selection | 171 | // check for correct element selection |
172 | if (this.application.ninja.selectedElements[0]._element != this.parentComponent.parentComponent.animatedElement) { | 172 | if (this.application.ninja.selectedElements[0]!= this.parentComponent.parentComponent.animatedElement) { |
173 | console.log("Wrong element selected for this keyframe track"); | 173 | console.log("Wrong element selected for this keyframe track"); |
174 | } else { | 174 | } else { |
175 | // update tweenedProperties and tell containing track to update CSS rule | 175 | // update tweenedProperties and tell containing track to update CSS rule |