diff options
author | Jon Reid | 2012-03-21 11:37:48 -0700 |
---|---|---|
committer | Jon Reid | 2012-03-21 11:37:48 -0700 |
commit | 3669eea4bde3518ce080048e9f53d2dd111fd8be (patch) | |
tree | d88892df558c080342a754351059c0d4a10beba2 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
parent | 9d7cd4d067b988a65cdea3059769617487028a22 (diff) | |
download | ninja-3669eea4bde3518ce080048e9f53d2dd111fd8be.tar.gz |
Timeline: Bug fix: style collapsers not staying in synch. Also, removed console.log calls in hintable component.
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 03d06d98..0ba49c44 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -915,11 +915,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
915 | this.arrLayers[i].layerData.isSelected = false; | 915 | this.arrLayers[i].layerData.isSelected = false; |
916 | } | 916 | } |
917 | 917 | ||
918 | if (this.arrLayers[i].layerData.triggerBinding === true) { | 918 | this.triggerLayerBinding(i); |
919 | this.arrLayers[i].layerData.triggerBinding = false; | ||
920 | } else { | ||
921 | this.arrLayers[i].layerData.triggerBinding = true; | ||
922 | } | ||
923 | } | 919 | } |
924 | 920 | ||
925 | this.layerRepetition.selectedIndexes = [layerIndex]; | 921 | this.layerRepetition.selectedIndexes = [layerIndex]; |
@@ -1077,6 +1073,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1077 | } | 1073 | } |
1078 | } | 1074 | } |
1079 | }, | 1075 | }, |
1076 | // Trigger the layer/track data binding | ||
1077 | triggerLayerBinding : { | ||
1078 | value: function(intIndex) { | ||
1079 | if (this.arrLayers[intIndex].layerData.triggerBinding === true) { | ||
1080 | this.arrLayers[intIndex].layerData.triggerBinding = false; | ||
1081 | } else { | ||
1082 | this.arrLayers[intIndex].layerData.triggerBinding = true; | ||
1083 | } | ||
1084 | } | ||
1085 | }, | ||
1080 | /* === END: Controllers === */ | 1086 | /* === END: Controllers === */ |
1081 | 1087 | ||
1082 | /* === BEGIN: Logging routines === */ | 1088 | /* === BEGIN: Logging routines === */ |