diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 6e7d410c..2e0bf7dd 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -19,7 +19,7 @@ | |||
19 | "element": {"#": "timeline_panel"}, | 19 | "element": {"#": "timeline_panel"}, |
20 | "user_layers": {"#": "user_layers"}, | 20 | "user_layers": {"#": "user_layers"}, |
21 | "track_container": {"#": "right_inside"}, | 21 | "track_container": {"#": "right_inside"}, |
22 | "timeline_leftpane" : {"#" : "timeline_leftpane"}, | 22 | "timeline_leftpane" : {"#" : "leftpane_inside"}, |
23 | "layer_tracks": {"#": "layer_tracks"}, | 23 | "layer_tracks": {"#": "layer_tracks"}, |
24 | "master_track": {"#": "master_track"}, | 24 | "master_track": {"#": "master_track"}, |
25 | "time_markers" : {"#": "timeline_markers"}, | 25 | "time_markers" : {"#": "timeline_markers"}, |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index df018ee3..67eae45c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -913,6 +913,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
913 | } else { | 913 | } else { |
914 | this.arrLayers[i].layerData.isSelected = false; | 914 | this.arrLayers[i].layerData.isSelected = false; |
915 | } | 915 | } |
916 | |||
917 | if (this.arrLayers[i].layerData.triggerBinding === true) { | ||
918 | this.arrLayers[i].layerData.triggerBinding = false; | ||
919 | } else { | ||
920 | this.arrLayers[i].layerData.triggerBinding = true; | ||
921 | } | ||
916 | } | 922 | } |
917 | 923 | ||
918 | this.layerRepetition.selectedIndexes = [layerIndex]; | 924 | this.layerRepetition.selectedIndexes = [layerIndex]; |