diff options
author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /js/mediators/element-mediator.js | |
parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/mediators/element-mediator.js')
-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 | }, |