diff options
author | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
commit | 01cf259da7aaa7d70789d9a7c32111d88b477463 (patch) | |
tree | 0bff3395ac681e5f685d2267f7dbc03a8e32bc4a /js/helper-classes/3D/view-utils.js | |
parent | 331ea08655245e3532e48bf160d5f68a04d8723f (diff) | |
parent | 13368ca6ebbc13adeafccd898dfffd7ce37cb28a (diff) | |
download | ninja-01cf259da7aaa7d70789d9a7c32111d88b477463.tar.gz |
Merge branch 'refs/heads/ToolFixes' into WebGLMaterials
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/helper-classes/3D/view-utils.js')
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index 41fb8d20..63c2cb52 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js | |||
@@ -1152,10 +1152,19 @@ exports.ViewUtils = Montage.create(Component, { | |||
1152 | // MISCELLANEOUS | 1152 | // MISCELLANEOUS |
1153 | // event.layerX/Y: var pt = viewUtils.getMousePoint(event); | 1153 | // event.layerX/Y: var pt = viewUtils.getMousePoint(event); |
1154 | 1154 | ||
1155 | getStageDimension: { | ||
1156 | value: function() | ||
1157 | { | ||
1158 | var width = parseInt(this.application.ninja.stage.documentRoot.elementModel.stageDimension.style.getProperty("width")); | ||
1159 | var height= parseInt(this.application.ninja.stage.documentRoot.elementModel.stageDimension.style.getProperty("height")); | ||
1160 | return[width,height]; | ||
1161 | } | ||
1162 | }, | ||
1163 | |||
1155 | getStage: { | 1164 | getStage: { |
1156 | value: function() | 1165 | value: function() |
1157 | { | 1166 | { |
1158 | return snapManagerModule.SnapManager.getStage(); | 1167 | return this.application.ninja.stage.snapManager.getStage(); |
1159 | } | 1168 | } |
1160 | }, | 1169 | }, |
1161 | 1170 | ||
@@ -1255,7 +1264,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
1255 | { | 1264 | { |
1256 | value: function() | 1265 | value: function() |
1257 | { | 1266 | { |
1258 | return this.application.ninjs.stage.canvas; | 1267 | return this.application.ninja.stage.canvas; |
1259 | } | 1268 | } |
1260 | }, | 1269 | }, |
1261 | 1270 | ||