diff options
author | Valerio Virgillito | 2012-04-09 10:33:35 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-09 10:33:35 -0700 |
commit | bd43ce383b050d03b0f92cc923c517febc66ca28 (patch) | |
tree | 91b95c6c9aef779a743b710105546a8ae74bff12 /js/controllers/selection-controller.js | |
parent | 86b98ea086b133f4efb247c39fc6200dcf383a65 (diff) | |
parent | c62c5c4287a1ee8a276b32dc61f06abbc24818ec (diff) | |
download | ninja-bd43ce383b050d03b0f92cc923c517febc66ca28.tar.gz |
Merge pull request #159 from mqg734/WebGLMaterials
3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
Diffstat (limited to 'js/controllers/selection-controller.js')
-rwxr-xr-x | js/controllers/selection-controller.js | 7 |
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, { | |||
45 | this.eventManager.addEventListener("openDocument", this, false); | 45 | this.eventManager.addEventListener("openDocument", this, false); |
46 | this.eventManager.addEventListener("elementAdded", this, false); | 46 | this.eventManager.addEventListener("elementAdded", this, false); |
47 | this.eventManager.addEventListener("elementsRemoved", this, false); | 47 | this.eventManager.addEventListener("elementsRemoved", this, false); |
48 | this.eventManager.addEventListener("elementReplaced", this, false); | ||
48 | this.eventManager.addEventListener("selectAll", this, false); | 49 | this.eventManager.addEventListener("selectAll", this, false); |
49 | this.eventManager.addEventListener("switchDocument", this, false); | 50 | this.eventManager.addEventListener("switchDocument", this, false); |
50 | this.eventManager.addEventListener("closeDocument", this, false); | 51 | this.eventManager.addEventListener("closeDocument", this, false); |
@@ -103,6 +104,12 @@ exports.SelectionController = Montage.create(Component, { | |||
103 | } | 104 | } |
104 | }, | 105 | }, |
105 | 106 | ||
107 | handleElementReplaced: { | ||
108 | value: function(event) { | ||
109 | this.application.ninja.selectedElements[this.application.ninja.selectedElements.indexOf(event.detail.data.oldChild)] = event.detail.data.newChild; | ||
110 | } | ||
111 | }, | ||
112 | |||
106 | handleSelectAll: { | 113 | handleSelectAll: { |
107 | value: function(event) { | 114 | value: function(event) { |
108 | var selected = [], childNodes = []; | 115 | var selected = [], childNodes = []; |