diff options
author | Nivesh Rajbhandari | 2012-05-10 12:01:16 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-10 12:01:16 -0700 |
commit | 2088ff54c96af4bd5c96075b74939b50c56f5f24 (patch) | |
tree | 1248de2aa359b76f380eb4d1fadd999b89fa8fca /js/controllers | |
parent | fb71f5715a288b59d6b151c11a293e179d2c9ace (diff) | |
download | ninja-2088ff54c96af4bd5c96075b74939b50c56f5f24.tar.gz |
New stage template should not distinguish between user and template body styles.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/elements/body-controller.js | 6 | ||||
-rwxr-xr-x | js/controllers/styles-controller.js | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 943594f2..5c23dcf7 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
@@ -13,7 +13,7 @@ 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) + ")", true); | 16 | this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); |
17 | 17 | ||
18 | el.elementModel.props3D.matrix3d = mat; | 18 | el.elementModel.props3D.matrix3d = mat; |
19 | el.elementModel.props3D.perspectiveDist = dist; | 19 | el.elementModel.props3D.perspectiveDist = dist; |
@@ -49,13 +49,13 @@ exports.BodyController = Montage.create(ElementController, { | |||
49 | switch(p) { | 49 | switch(p) { |
50 | case "body-background": | 50 | case "body-background": |
51 | case "background": | 51 | case "background": |
52 | this.application.ninja.stylesController.setElementStyle(el, "background-color", value, true); | 52 | this.application.ninja.stylesController.setElementStyle(el, "background-color", value); |
53 | break; | 53 | break; |
54 | case "overflow": | 54 | case "overflow": |
55 | case "width": | 55 | case "width": |
56 | case "height": | 56 | case "height": |
57 | case "-webkit-transform-style": | 57 | case "-webkit-transform-style": |
58 | this.application.ninja.stylesController.setElementStyle(el, p, value, true); | 58 | this.application.ninja.stylesController.setElementStyle(el, p, value); |
59 | this.application.ninja.stage.updatedStage = true; | 59 | this.application.ninja.stage.updatedStage = true; |
60 | break; | 60 | break; |
61 | default: | 61 | default: |
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 647c0870..7707a826 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -1130,6 +1130,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1130 | 1130 | ||
1131 | getMatrixFromElement : { | 1131 | getMatrixFromElement : { |
1132 | value: function(element, isStage) { | 1132 | value: function(element, isStage) { |
1133 | isStage = false; | ||
1133 | var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage), | 1134 | var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage), |
1134 | mat; | 1135 | mat; |
1135 | 1136 | ||
@@ -1163,6 +1164,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1163 | 1164 | ||
1164 | getPerspectiveDistFromElement : { | 1165 | getPerspectiveDistFromElement : { |
1165 | value: function(element, isStage) { | 1166 | value: function(element, isStage) { |
1167 | isStage = false; | ||
1166 | var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage), | 1168 | var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage), |
1167 | dist; | 1169 | dist; |
1168 | 1170 | ||