diff options
author | Jon Reid | 2012-05-17 17:16:11 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-17 17:16:11 -0700 |
commit | d3e2e8c0e4be6a324eac3a3ea050b4c41183f79b (patch) | |
tree | 23716f5ebc5f5dcebe9c6aeca7275b5bd4b1c569 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
parent | 91f3d92d787b79d30a6727a6ecd88d55d8047ad6 (diff) | |
download | ninja-d3e2e8c0e4be6a324eac3a3ea050b4c41183f79b.tar.gz |
Timeline: Bug fixes for multiselect
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 1ddb3977..ce8174b0 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1200,7 +1200,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1200 | 1200 | ||
1201 | // Select the layers, or clear the selection if none were found | 1201 | // Select the layers, or clear the selection if none were found |
1202 | if (arrSelectedElements.length > 0) { | 1202 | if (arrSelectedElements.length > 0) { |
1203 | console.log("TimelinePanel.updateStageSelection, ", arrSelectedElements) | ||
1204 | this.application.ninja.selectionController.selectElements(arrSelectedElements); | 1203 | this.application.ninja.selectionController.selectElements(arrSelectedElements); |
1205 | } else { | 1204 | } else { |
1206 | this.application.ninja.selectionController.executeSelectElement(); | 1205 | this.application.ninja.selectionController.executeSelectElement(); |
@@ -1641,6 +1640,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1641 | 1640 | ||
1642 | selectLayer:{ | 1641 | selectLayer:{ |
1643 | value:function (layerIndex, userSelection) { | 1642 | value:function (layerIndex, userSelection) { |
1643 | console.log("=----> Please update your component to use the new TimelinePanel.selectLayers method. <----="); | ||
1644 | this.selectLayers([layerIndex]); | ||
1645 | if (userSelection === true) { | ||
1646 | this.updateStageSelection(); | ||
1647 | } | ||
1648 | |||
1649 | /* | ||
1644 | 1650 | ||
1645 | console.log('TimelinePanel.selectLayer') | 1651 | console.log('TimelinePanel.selectLayer') |
1646 | 1652 | ||
@@ -1676,6 +1682,7 @@ console.log('TimelinePanel.selectLayer') | |||
1676 | this._captureSelection = true; | 1682 | this._captureSelection = true; |
1677 | } | 1683 | } |
1678 | this.resetMasterDuration(); | 1684 | this.resetMasterDuration(); |
1685 | */ | ||
1679 | } | 1686 | } |
1680 | }, | 1687 | }, |
1681 | 1688 | ||