aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D/view-utils.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-30 10:33:16 -0700
committerValerio Virgillito2012-05-30 10:33:16 -0700
commit0c2f181ca565f9c3b68fcfdc7124416e2e2fa647 (patch)
treef6d5300c528a69305abd30ffea1beee016241375 /js/helper-classes/3D/view-utils.js
parent31b094ee21102f99a4021d505bc3a28527c9e23d (diff)
parentd4f2df2a7b3ec79fc54e17f09195dbc37331f051 (diff)
downloadninja-0c2f181ca565f9c3b68fcfdc7124416e2e2fa647.tar.gz
Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into document-bindings-fix
Conflicts: js/stage/stage-deps.js js/stage/stage.reel/stage.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/helper-classes/3D/view-utils.js')
-rwxr-xr-xjs/helper-classes/3D/view-utils.js15
1 files changed, 6 insertions, 9 deletions
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index a3d09404..3c7ae6ff 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -195,7 +195,12 @@ exports.ViewUtils = Montage.create(Component, {
195 195
196 getPerspectiveDistFromElement: { 196 getPerspectiveDistFromElement: {
197 value: function( elt ) { 197 value: function( elt ) {
198 return ElementsMediator.getPerspectiveDist(elt); 198 var pDist = ElementsMediator.getPerspectiveDist(elt);
199 if(pDist === "none") {
200 return null;
201 } else {
202 return pDist;
203 }
199 } 204 }
200 }, 205 },
201 206
@@ -1320,14 +1325,6 @@ exports.ViewUtils = Montage.create(Component, {
1320 } 1325 }
1321 }, 1326 },
1322 1327
1323 getCurrentDocument:
1324 {
1325 value: function()
1326 {
1327 return snapManagerModule.SnapManager.application.ninja.currentDocument;
1328 }
1329 },
1330
1331 setStageZoom: { 1328 setStageZoom: {
1332 value:function( globalPt, zoomFactor ) { 1329 value:function( globalPt, zoomFactor ) {
1333 var localPt; 1330 var localPt;