diff options
author | Valerio Virgillito | 2012-04-30 16:15:47 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-30 16:15:47 -0700 |
commit | 9c8fbdd11fdbe9ae73d57147de84b799c5a87652 (patch) | |
tree | 9a6d798fcbf33518f1488ed84fa075c707ecffd0 /js/controllers | |
parent | 6b1a6994d98a18b45016b97ac8d81483109a586c (diff) | |
download | ninja-9c8fbdd11fdbe9ae73d57147de84b799c5a87652.tar.gz |
Squashed commit of stage architecture
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 2 | ||||
-rwxr-xr-x | js/controllers/elements/body-controller.js | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 4be0767a..7795a74d 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -483,6 +483,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
483 | 483 | ||
484 | if(!this.webTemplate) { | 484 | if(!this.webTemplate) { |
485 | this._showCurrentDocument(); | 485 | this._showCurrentDocument(); |
486 | } else { | ||
487 | this.application.ninja.stage.stageView.showRulers(); | ||
486 | } | 488 | } |
487 | 489 | ||
488 | this.webTemplate = false; | 490 | this.webTemplate = false; |
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index fbbb7c6e..839d0787 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
@@ -12,6 +12,17 @@ exports.BodyController = Montage.create(ElementController, { | |||
12 | // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat" | 12 | // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat" |
13 | set3DProperties: { | 13 | set3DProperties: { |
14 | value: function(el, props, update3DModel) { | 14 | value: function(el, props, update3DModel) { |
15 | var dist = props["dist"], mat = props["mat"]; | ||
16 | this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true); | ||
17 | |||
18 | el.elementModel.props3D.matrix3d = mat; | ||
19 | el.elementModel.props3D.perspectiveDist = dist; | ||
20 | |||
21 | this.application.ninja.stage.updatedStage = true; | ||
22 | |||
23 | if(update3DModel) { | ||
24 | this._update3DProperties(el, mat, dist); | ||
25 | } | ||
15 | } | 26 | } |
16 | }, | 27 | }, |
17 | 28 | ||