diff options
author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /js/mediators | |
parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/element-mediator.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index 91b09475..a6f31703 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -92,6 +92,11 @@ exports.ElementMediator = Montage.create(NJComponent, { | |||
92 | _addElement: { | 92 | _addElement: { |
93 | value: function(el, rules, noEvent) { | 93 | value: function(el, rules, noEvent) { |
94 | ElementController.addElement(el, rules); | 94 | ElementController.addElement(el, rules); |
95 | var p3d = this.get3DProperties(el); | ||
96 | if(p3d) | ||
97 | { | ||
98 | el.elementModel.controller["set3DProperties"](el, [p3d], 0, true); | ||
99 | } | ||
95 | if(!noEvent) NJevent("elementAdded", el); | 100 | if(!noEvent) NJevent("elementAdded", el); |
96 | } | 101 | } |
97 | }, | 102 | }, |