diff options
| author | Nivesh Rajbhandari | 2012-05-17 11:10:15 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-17 11:10:15 -0700 |
| commit | 3d36ca3feb7a2cabd7d64335b2417637bd9aa906 (patch) | |
| tree | b89119d747de0c7333a8cbde4a7689c5fb102d5c /js/panels/Timeline | |
| parent | 2ba4a6fab3b81b537521760ee5f95f1bc80027f9 (diff) | |
| parent | 0e8ca026098e7abfaeb642643a21977490782922 (diff) | |
| download | ninja-3d36ca3feb7a2cabd7d64335b2417637bd9aa906.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/panels/Timeline')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 94ca9b57..c382c9a7 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -110,7 +110,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 110 | this._selectedLayerID = newVal; | 110 | this._selectedLayerID = newVal; |
| 111 | this._captureSelection = true; | 111 | this._captureSelection = true; |
| 112 | if (this.currentLayerSelected !== false) { | 112 | if (this.currentLayerSelected !== false) { |
| 113 | this.selectLayer(selectIndex, true); | 113 | this.selectLayer(selectIndex, false); |
| 114 | } | 114 | } |
| 115 | if (this.currentLayersSelected !== false) { | 115 | if (this.currentLayersSelected !== false) { |
| 116 | this.selectLayers(this.currentLayersSelected); | 116 | this.selectLayers(this.currentLayersSelected); |