aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
diff options
context:
space:
mode:
authorKruti Shah2012-07-17 12:40:00 -0700
committerKruti Shah2012-07-17 12:40:00 -0700
commitbf2d7bdb22c28089dc1067bc9094ebc590daac87 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parentb4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff)
downloadninja-bf2d7bdb22c28089dc1067bc9094ebc590daac87.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 981ddc22..c048bcb2 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1346,6 +1346,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1346 // We will no longer have multiple things selected, so wipe that info out 1346 // We will no longer have multiple things selected, so wipe that info out
1347 // if it isn't already gone. 1347 // if it isn't already gone.
1348 this.currentLayersSelected = false; 1348 this.currentLayersSelected = false;
1349 this.currentElementsSelected = false;
1349 1350
1350 for (i = arrElementsLength-1; i >= 0; i--) { 1351 for (i = arrElementsLength-1; i >= 0; i--) {
1351 var thingToPush = this.createLayerTemplate(); 1352 var thingToPush = this.createLayerTemplate();
@@ -1903,6 +1904,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1903 // This is a paste action, because event.detail has more than one item in it. 1904 // This is a paste action, because event.detail has more than one item in it.
1904 this.createStageElementsAt(true, event.detail); 1905 this.createStageElementsAt(true, event.detail);
1905 } 1906 }
1907 this.updateLayerSelection();
1906 } 1908 }
1907 }, 1909 },
1908 1910