diff options
author | Jose Antonio Marquez Russo | 2012-06-14 16:09:44 -0700 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-06-14 16:09:44 -0700 |
commit | aacfa86521c7d1c7159f1da1fad5bb2c638cc811 (patch) | |
tree | 4651821120f04eb189b5f1ddc3e871a6c4856bcd /js/controllers/elements | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
parent | 9185145b3ab37070c7f32befaec1ab38486745b3 (diff) | |
download | ninja-aacfa86521c7d1c7159f1da1fad5bb2c638cc811.tar.gz |
Merge pull request #36 from mqg734/FileIO_Jose
Save user's html and body styles and inline body styles for 3d so they don't get saved out with the document.
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/body-controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 27989c65..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; |