diff options
author | Valerio Virgillito | 2012-02-21 14:36:41 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-21 14:36:41 -0800 |
commit | 1d2c928c35ccc7cd875a329b2e235f34eb4f0c0d (patch) | |
tree | febe5a23c3667523e90de031987a11764f417da7 /js/mediators | |
parent | b1daf0b285a4a96bfd0086709c20e3682d75551a (diff) | |
parent | f9d34a54baf61ccdf77732b1aaedb29d296b8c2e (diff) | |
download | ninja-1d2c928c35ccc7cd875a329b2e235f34eb4f0c0d.tar.gz |
Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal into file-io
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/element-mediator.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index 95a72c89..51923f08 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -28,13 +28,7 @@ exports.ElementMediator = Montage.create(NJComponent, { | |||
28 | // TODO use the specific controller to be able to subclass the functionality | 28 | // TODO use the specific controller to be able to subclass the functionality |
29 | handleElementAdding: { | 29 | handleElementAdding: { |
30 | value: function(event) { | 30 | value: function(event) { |
31 | /* | ||
32 | var cmd = ElementControllerCommands.addElementCommand(event.detail.el, event.detail.data); | ||
33 | NJevent("sendToUndo", cmd); | ||
34 | cmd.execute(); | ||
35 | */ | ||
36 | this.addElement(event.detail.el, event.detail.data); | 31 | this.addElement(event.detail.el, event.detail.data); |
37 | |||
38 | } | 32 | } |
39 | }, | 33 | }, |
40 | 34 | ||
@@ -97,8 +91,7 @@ exports.ElementMediator = Montage.create(NJComponent, { | |||
97 | value: function(el, rules, noEvent) { | 91 | value: function(el, rules, noEvent) { |
98 | ElementController.addElement(el, rules); | 92 | ElementController.addElement(el, rules); |
99 | var p3d = this.get3DProperties(el); | 93 | var p3d = this.get3DProperties(el); |
100 | if(p3d) | 94 | if(p3d) { |
101 | { | ||
102 | el.elementModel.controller["set3DProperties"](el, [p3d], 0, true); | 95 | el.elementModel.controller["set3DProperties"](el, [p3d], 0, true); |
103 | } | 96 | } |
104 | if(!noEvent) { | 97 | if(!noEvent) { |