From 75bca514358ed90b8b4274bafed9422c82695776 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 22 Feb 2012 11:58:45 -0800 Subject: Integrating Zoom tool fixes. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/3D/snap-manager.js | 1 + js/helper-classes/3D/view-utils.js | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'js/helper-classes/3D') diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 0a950658..ada6960b 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js @@ -1087,6 +1087,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { // we need to check the orientation of the bounds var nrm = MathUtils.getNormalFromBounds3D( bounds3D ); + if (MathUtils.fpSign(nrm[2]) == 0) return null; var zNrm = nrm[2]; var dist; diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index a2fac34f..bedda8bf 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js @@ -1226,6 +1226,14 @@ exports.ViewUtils = Montage.create(Component, { } }, + getCurrentDocument: + { + value: function() + { + return snapManagerModule.SnapManager.application.ninja.currentDocument; + } + }, + setStageZoom: { value:function( globalPt, zoomFactor ) { var localPt; -- cgit v1.2.3 From 3285038757aed8bf200fb6a97ebbf2f49a998869 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 22 Feb 2012 12:12:44 -0800 Subject: Removing unused method that was using snapManager. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/3D/view-utils.js | 8 -------- 1 file changed, 8 deletions(-) (limited to 'js/helper-classes/3D') diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index bedda8bf..a2fac34f 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js @@ -1226,14 +1226,6 @@ exports.ViewUtils = Montage.create(Component, { } }, - getCurrentDocument: - { - value: function() - { - return snapManagerModule.SnapManager.application.ninja.currentDocument; - } - }, - setStageZoom: { value:function( globalPt, zoomFactor ) { var localPt; -- cgit v1.2.3 From c7b8d5d07834f85c530baf041ec2c818e86cc3a3 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 09:24:00 -0800 Subject: Removing duplicate get/setElementPlanes method. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/3D/LinePlaneIntersectRec.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'js/helper-classes/3D') diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js index e075dd3d..cb172bf7 100755 --- a/js/helper-classes/3D/LinePlaneIntersectRec.js +++ b/js/helper-classes/3D/LinePlaneIntersectRec.js @@ -42,9 +42,6 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object setDeltaVis: { value: function(d) { this._deltaVis = d; } }, getDeltaVis: { value: function() { return this._deltaVis; } }, - getElementPlanes: { value: function() { return this._deltaVis; } }, - setElementPlanes: { value: function(p) { this._elementPlanes = p; } }, - setNext: { value: function(n) { this._next = n; } }, getNext: { value: function() { return this._next; } }, -- cgit v1.2.3 From 2f2472efe0ca55d52fcdf4934bfa52008b68e1de Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 09:40:16 -0800 Subject: Javascript does not evaluate a return with its expression in a new line. The return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/3D/hit-record.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'js/helper-classes/3D') diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js index 5546cc5a..2c60adc6 100755 --- a/js/helper-classes/3D/hit-record.js +++ b/js/helper-classes/3D/hit-record.js @@ -139,12 +139,10 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype, isSomeGridTypeSnap : { value: function() { - return - ( - (this._type == this.SNAP_TYPE_GRID_VERTEX) || + return ((this._type == this.SNAP_TYPE_GRID_VERTEX) || (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) || (this._type == this.SNAP_TYPE_GRID_VERTICAL) - ) + ); } }, -- cgit v1.2.3