diff options
author | hwc487 | 2012-04-13 11:52:13 -0700 |
---|---|---|
committer | hwc487 | 2012-04-13 11:52:13 -0700 |
commit | 4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch) | |
tree | 3dc2e3c5a041179eed38eab1a00f851554e50005 /js/controllers/elements/stage-controller.js | |
parent | 521df0ed9242efff45715998837068c87aca7efd (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts:
js/helper-classes/3D/view-utils.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
js/tools/Translate3DToolBase.js
Diffstat (limited to 'js/controllers/elements/stage-controller.js')
-rwxr-xr-x | js/controllers/elements/stage-controller.js | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js index 97ea3aa5..f376e40f 100755 --- a/js/controllers/elements/stage-controller.js +++ b/js/controllers/elements/stage-controller.js | |||
@@ -83,8 +83,14 @@ exports.StageController = Montage.create(ElementController, { | |||
83 | return el.elementModel.stageDimension.style.getProperty(p); | 83 | return el.elementModel.stageDimension.style.getProperty(p); |
84 | case "width": | 84 | case "width": |
85 | return el.elementModel.stageDimension.style.getProperty(p); | 85 | return el.elementModel.stageDimension.style.getProperty(p); |
86 | case "-webkit-transform-style": | ||
87 | if(el.id === "Viewport") { | ||
88 | return this.application.ninja.stylesController.getElementStyle(el, p, false, true); | ||
89 | } else { | ||
90 | return el.elementModel.stageView.style.getProperty(p); | ||
91 | } | ||
86 | default: | 92 | default: |
87 | return ElementController.getProperty(el, p, false, true); | 93 | return ElementController.getProperty(el, p, true, true); |
88 | //console.log("Undefined Stage property ", p); | 94 | //console.log("Undefined Stage property ", p); |
89 | } | 95 | } |
90 | } | 96 | } |
@@ -111,6 +117,10 @@ exports.StageController = Montage.create(ElementController, { | |||
111 | this.application.ninja.currentDocument.iframe.height = parseInt(value) + 400; | 117 | this.application.ninja.currentDocument.iframe.height = parseInt(value) + 400; |
112 | el.elementModel.stageDimension.style.setProperty(p, value); | 118 | el.elementModel.stageDimension.style.setProperty(p, value); |
113 | break; | 119 | break; |
120 | case "-webkit-transform-style": | ||
121 | el.elementModel.stageView.style.setProperty(p, value); | ||
122 | this.application.ninja.stage.updatedStage = true; | ||
123 | break; | ||
114 | default: | 124 | default: |
115 | console.log("Undefined property ", p, "for the Stage Controller"); | 125 | console.log("Undefined property ", p, "for the Stage Controller"); |
116 | } | 126 | } |
@@ -143,11 +153,10 @@ exports.StageController = Montage.create(ElementController, { | |||
143 | 153 | ||
144 | if (el) | 154 | if (el) |
145 | { | 155 | { |
146 | var xformStr = this.application.ninja.elementMediator.getProperty(el, "-webkit-transform"); | 156 | mat = this.application.ninja.stylesController.getMatrixFromElement(el, true); |
147 | if (xformStr) | 157 | if (!mat) { |
148 | mat = this.transformStringToMat( xformStr ); | ||
149 | if (!mat) | ||
150 | mat = Matrix.I(4); | 158 | mat = Matrix.I(4); |
159 | } | ||
151 | 160 | ||
152 | var zoom = this.application.ninja.elementMediator.getProperty(el, "zoom"); | 161 | var zoom = this.application.ninja.elementMediator.getProperty(el, "zoom"); |
153 | if (zoom) | 162 | if (zoom) |
@@ -170,5 +179,20 @@ exports.StageController = Montage.create(ElementController, { | |||
170 | return mat; | 179 | return mat; |
171 | } | 180 | } |
172 | } | 181 | } |
173 | } | 182 | }, |
183 | |||
184 | getPerspectiveDist: { | ||
185 | value: function(el) { | ||
186 | if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) | ||
187 | { | ||
188 | return el.elementModel.props3D.perspectiveDist; | ||
189 | } | ||
190 | else | ||
191 | { | ||
192 | var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, true); | ||
193 | el.elementModel.props3D.perspectiveDist = dist; | ||
194 | return dist; | ||
195 | } | ||
196 | } | ||
197 | }, | ||
174 | }); | 198 | }); |