diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/controllers/elements/body-controller.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/controllers/elements/body-controller.js')
-rwxr-xr-x | js/controllers/elements/body-controller.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 0dc11b82..0ca6c417 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
@@ -13,7 +13,8 @@ exports.BodyController = Montage.create(ElementController, { | |||
13 | set3DProperties: { | 13 | set3DProperties: { |
14 | value: function(el, props, update3DModel) { | 14 | value: function(el, props, update3DModel) { |
15 | var dist = props["dist"], mat = props["mat"]; | 15 | var dist = props["dist"], mat = props["mat"]; |
16 | this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); | 16 | // this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); |
17 | el.style["-webkit-transform"] = "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"; | ||
17 | 18 | ||
18 | el.elementModel.props3D.matrix3d = mat; | 19 | el.elementModel.props3D.matrix3d = mat; |
19 | el.elementModel.props3D.perspectiveDist = dist; | 20 | el.elementModel.props3D.perspectiveDist = dist; |
@@ -37,7 +38,7 @@ exports.BodyController = Montage.create(ElementController, { | |||
37 | case "height": | 38 | case "height": |
38 | case "width": | 39 | case "width": |
39 | case "-webkit-transform-style": | 40 | case "-webkit-transform-style": |
40 | return this.application.ninja.stylesController.getElementStyle(el, p, true, true); | 41 | return this.application.ninja.stylesController.getElementStyle(el, p); |
41 | default: | 42 | default: |
42 | return ElementController.getProperty(el, p, true, true); | 43 | return ElementController.getProperty(el, p, true, true); |
43 | //console.log("Undefined Stage property ", p); | 44 | //console.log("Undefined Stage property ", p); |