diff options
author | Valerio Virgillito | 2012-02-08 10:18:36 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-08 10:18:36 -0800 |
commit | 763910b9d074137eb7dee80447b89407ce5750c9 (patch) | |
tree | 3c8820a06afd442fa5ba8e68665a4d2836230628 /js/mediators | |
parent | e5579374ff39b80b8c0c69faba37f6f581758fe0 (diff) | |
parent | 329a859e2666716c3a1d99c6bd2679e10c81fc8d (diff) | |
download | ninja-763910b9d074137eb7dee80447b89407ce5750c9.tar.gz |
Merge pull request #20 from mqg734/ToolFixes
Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
Diffstat (limited to 'js/mediators')
-rw-r--r-- | js/mediators/element-mediator.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index c44e1cb5..9aefbca6 100644 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -112,6 +112,13 @@ exports.ElementMediator = Montage.create(NJComponent, { | |||
112 | } | 112 | } |
113 | }, | 113 | }, |
114 | 114 | ||
115 | replaceElement: { | ||
116 | value: function(el, el2) { | ||
117 | el2.elementModel = el.elementModel; | ||
118 | this.application.ninja.currentDocument.documentRoot.replaceChild(el2, el); | ||
119 | } | ||
120 | }, | ||
121 | |||
115 | getNJProperty: { | 122 | getNJProperty: { |
116 | value: function(el, p) { | 123 | value: function(el, p) { |
117 | if(el.elementModel) { | 124 | if(el.elementModel) { |