diff options
author | Nivesh Rajbhandari | 2012-04-05 11:48:57 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-05 11:48:57 -0700 |
commit | 0798df3eba23fad4d48dd3a59e20451a406569e1 (patch) | |
tree | c4e791d5a4a4c2317fc91ff0e51488fb993f9ef5 /js | |
parent | c950fc80742f54f6b485bbda66f69d42cb762d40 (diff) | |
download | ninja-0798df3eba23fad4d48dd3a59e20451a406569e1.tar.gz |
Adding back fix in mediator to not set 3d styles unless necessary.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-x | js/mediators/element-mediator.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index c153101e..a05ca631 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -29,14 +29,14 @@ exports.ElementMediator = Montage.create(Component, { | |||
29 | if(Array.isArray(elements)) { | 29 | if(Array.isArray(elements)) { |
30 | elements.forEach(function(element) { | 30 | elements.forEach(function(element) { |
31 | ElementController.addElement(element, rules); | 31 | ElementController.addElement(element, rules); |
32 | if(element.elementModel && element.elementModel.props3D) { | ||
33 | element.elementModel.props3D.init(element, false); | ||
34 | } | ||
32 | }); | 35 | }); |
33 | } else { | 36 | } else { |
34 | ElementController.addElement(elements, rules); | 37 | ElementController.addElement(elements, rules); |
35 | 38 | if(elements.elementModel && elements.elementModel.props3D) { | |
36 | // TODO - Check with webgl branch - Props seem to be already there. | 39 | elements.elementModel.props3D.init(elements, false); |
37 | var prop3d = this.get3DProperties(elements); | ||
38 | if(prop3d) { | ||
39 | elements.elementModel.controller["set3DProperties"](elements, [prop3d], 0, true); | ||
40 | } | 40 | } |
41 | } | 41 | } |
42 | 42 | ||