Merge branch 'refs/heads/NINJAmaster' into TimelineUber

1 files changed, 7 insertions, 0 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index dbb3f30d..5665b09c 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -45,6 +45,7 @@ exports.SelectionController = Montage.create(Component, {
             this.eventManager.addEventListener("openDocument", this, false);
             this.eventManager.addEventListener("elementAdded", this, false);
             this.eventManager.addEventListener("elementsRemoved", this, false);
+            this.eventManager.addEventListener("elementReplaced", this, false);
             this.eventManager.addEventListener("selectAll", this, false);
             this.eventManager.addEventListener("switchDocument", this, false);
             this.eventManager.addEventListener("closeDocument", this, false);
@@ -103,6 +104,12 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
+    handleElementReplaced: {
+        value: function(event) {
+            this.application.ninja.selectedElements[this.application.ninja.selectedElements.indexOf(event.detail.data.oldChild)] = event.detail.data.newChild;
+        }
+    },
+
     handleSelectAll: {
         value: function(event) {
             var selected = [], childNodes = [];