From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/tools/SelectionTool.js | 70 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'js/tools/SelectionTool.js') diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 03208dfe..042d2573 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js @@ -201,9 +201,9 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { selectedItems = []; box[0] = this.downPoint.x; - box[1] = this.downPoint.y; - box[2] = point.x; - box[3] = point.y; + box[1] = this.downPoint.y; + box[2] = point.x; + box[3] = point.y; //selectionManagerModule.selectionManager.marqueeSelection(box); var childNodes = this.application.ninja.currentDocument.model.documentRoot.childNodes, @@ -403,11 +403,11 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { }, _moveElements: { - value: function (transMat) { + value: function (transMat) { var elt, curMat, targets = []; -// var matInv = glmat4.inverse(this._startMat, []); -// var qMat = glmat4.multiply(matInv, nMat, []); +// var matInv = glmat4.inverse(this._startMat, []); +// var qMat = glmat4.multiply(matInv, nMat, []); this._startMat = glmat4.multiply(transMat, this._startMat, [] ); var self = this; @@ -434,8 +434,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { } else { ElementsMediator.setProperties(targets, "Changing", "SelectionTool" ); } - } - }, + } + }, //------------------------------------------------------------------------- //Routines to modify the selected objects @@ -630,17 +630,17 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { }, /* - * The parameterization is based on the position of the - * snap point in pre-transformed element screen space - */ - parameterizeSnap: - { - value: function( hitRec ) - { - var paramPt = [0,0,0]; + * The parameterization is based on the position of the + * snap point in pre-transformed element screen space + */ + parameterizeSnap: + { + value: function( hitRec ) + { + var paramPt = [0,0,0]; var elt = this._getObjectBeingTracked(hitRec); - if (elt) - { + if (elt) + { this.clickedObject = elt; if(this._handleMode === null) { @@ -701,11 +701,11 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { break; } } - } + } - return paramPt; - } - }, + return paramPt; + } + }, /** * This function is for specifying custom feedback routine @@ -987,23 +987,23 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // TODO : Use the new element mediator to get element offsets _complicatedCollisionDetection: { value: function(elt, box) - { + { var left, top, width, height; left = box[0]; - width = box[2] - left; - if (width < 0) - { - left = box[2]; - width = -width; - } + width = box[2] - left; + if (width < 0) + { + left = box[2]; + width = -width; + } top = box[1]; - height = box[3] - top; - if (height < 0) - { - top = box[3]; - height = -height; - } + height = box[3] - top; + if (height < 0) + { + top = box[3]; + height = -height; + } var rtnVal = MathUtils.rectsOverlap( [left,top], width, height, elt ); -- cgit v1.2.3