aboutsummaryrefslogtreecommitdiff
path: root/js/tools/modifier-tool-base.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:00:19 -0700
committerArmen Kesablyan2012-06-20 15:00:19 -0700
commit120e31dcf1e11eed11ee430d77c438e7b073e9f8 (patch)
tree8c07b1203de42f6efdeebfc8663072fffb4a567b /js/tools/modifier-tool-base.js
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
parent52833c3d8a485944c42acc6ac0ae5139b3427da8 (diff)
downloadninja-120e31dcf1e11eed11ee430d77c438e7b073e9f8.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-xjs/tools/modifier-tool-base.js17
1 files changed, 8 insertions, 9 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 6c569f0a..14a7e619 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -21,7 +21,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
21 //------------------------------------------------------------------------- 21 //-------------------------------------------------------------------------
22 // Snapping-specific properties 22 // Snapping-specific properties
23 _canSnap: { value: true }, 23 _canSnap: { value: true },
24 _dragPlane: { value: null },
25 _snapParam: { value: null }, 24 _snapParam: { value: null },
26 _snapIndex: { value: -1 }, 25 _snapIndex: { value: -1 },
27 _useQuadPt: { value: false }, 26 _useQuadPt: { value: false },
@@ -163,15 +162,15 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
163 162
164 if(!this._dragPlane) 163 if(!this._dragPlane)
165 { 164 {
166// if( this._inLocalMode && (this._startMatArray.length === 1) ) 165 if((this._handleMode !== null) && (this.application.ninja.toolsData.selectedTool.action === "SelectionTool"))
167// { 166 {
168// this._dragPlane = viewUtils.getUnprojectedElementPlane(this._clickedObject); 167 this._dragPlane = viewUtils.getUnprojectedElementPlane(this.application.ninja.selectedElements[0]);
169// snapManager.setupDragPlaneFromPlane(this._dragPlane); 168 snapManager.setupDragPlaneFromPlane(this._dragPlane);
170// } 169 }
171// else 170 else
172// { 171 {
173 this._dragPlane = snapManager.setupDragPlanes( hitRec, true ); 172 this._dragPlane = snapManager.setupDragPlanes( hitRec, true );
174// } 173 }
175 } 174 }
176 175
177 // only do quadrant snapping if the 4 corners of the element are in the drag plane 176 // only do quadrant snapping if the 4 corners of the element are in the drag plane