diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 8be0caef..290dd6c1 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -473,7 +473,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
473 | returnObj.layerData.isTransformCollapsed = true; | 473 | returnObj.layerData.isTransformCollapsed = true; |
474 | returnObj.layerData.isStyleCollapsed = true; | 474 | returnObj.layerData.isStyleCollapsed = true; |
475 | returnObj.layerData.arrLayerStyles = []; | 475 | returnObj.layerData.arrLayerStyles = []; |
476 | returnObj.layerData.arrLayerStyles = []; | ||
477 | returnObj.layerData.elementsList = []; | 476 | returnObj.layerData.elementsList = []; |
478 | returnObj.layerData.deleted = false; | 477 | returnObj.layerData.deleted = false; |
479 | returnObj.layerData.isSelected = false; | 478 | returnObj.layerData.isSelected = false; |
@@ -915,11 +914,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
915 | */ | 914 | */ |
916 | 915 | ||
917 | 916 | ||
918 | // Deselect all layers. | 917 | // Deselect selected layers if they're not in arrSelectedIndexes. |
919 | for (i = 0; i < arrLayersLength; i++) { | 918 | for (i = 0; i < arrLayersLength; i++) { |
920 | if (this.arrLayers[i].layerData.isSelected === true) { | 919 | if (this.arrLayers[i].layerData.isSelected === true) { |
921 | this.arrLayers[i].layerData.isSelected = false; | 920 | if (arrSelectedIndexes.indexOf(i) < 0) { |
922 | this.triggerLayerBinding(i); | 921 | this.arrLayers[i].layerData.isSelected = false; |
922 | this.triggerLayerBinding(i); | ||
923 | } | ||
923 | } | 924 | } |
924 | } | 925 | } |
925 | if (this.currentLayersSelected !== false) { | 926 | if (this.currentLayersSelected !== false) { |
@@ -1360,7 +1361,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1360 | 1361 | ||
1361 | selectLayer:{ | 1362 | selectLayer:{ |
1362 | value:function (layerIndex, userSelection) { | 1363 | value:function (layerIndex, userSelection) { |
1363 | console.log("=----> Please update this component to use TimelinePanel.selectLayers. See this message for syntax. <----="); | 1364 | //console.log("=----> Please update this component to use TimelinePanel.selectLayers. See this message for syntax. <----="); |
1364 | this.selectLayers([layerIndex]); | 1365 | this.selectLayers([layerIndex]); |
1365 | if (userSelection === true) { | 1366 | if (userSelection === true) { |
1366 | this.updateStageSelection(); | 1367 | this.updateStageSelection(); |