From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/tools/BrushTool.js | 2 +- js/tools/LineTool.js | 2 +- js/tools/OvalTool.js | 2 +- js/tools/PanTool.js | 8 +++---- js/tools/PenTool.js | 44 +++++++++++++++++++-------------------- js/tools/Rotate3DToolBase.js | 14 ++++++------- js/tools/TextTool.js | 2 +- js/tools/ToolBase.js | 6 +++--- js/tools/Translate3DToolBase.js | 10 ++++----- js/tools/TranslateObject3DTool.js | 4 ++-- js/tools/drawing-tool-base.js | 10 ++++----- js/tools/drawing-tool.js | 8 +++---- js/tools/modifier-tool-base.js | 22 ++++++++++---------- 13 files changed, 67 insertions(+), 67 deletions(-) (limited to 'js/tools') diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index d8a2fde0..8bfec186 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js @@ -281,7 +281,7 @@ exports.BrushTool = Montage.create(ShapeTool, { if (this.options.useCalligraphic){ useCalligraphic = this.options.useCalligraphic; } - + var ctx = this.application.ninja.stage.drawingContext;//stageManagerModule.stageManager.drawingContext; if (ctx === null) throw ("null drawing context in Brushtool::ShowCurrentBrushStrokeOnStage"); diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index b0681af7..2dbaf593 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js @@ -173,7 +173,7 @@ exports.LineTool = Montage.create(ShapeTool, { slope, dx, dy; - + if (hitRec0 && hitRec1) { var p0 = hitRec0.getLocalPoint(), p1 = hitRec1.getLocalPoint(); diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js index e6451a75..4c78973d 100755 --- a/js/tools/OvalTool.js +++ b/js/tools/OvalTool.js @@ -52,7 +52,7 @@ exports.OvalTool = Montage.create(ShapeTool, { { return; } - + var left = Math.round(midPt[0] - 0.5*w); var top = Math.round(midPt[1] - 0.5*h); diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js index 11345ad9..28e4c04d 100755 --- a/js/tools/PanTool.js +++ b/js/tools/PanTool.js @@ -102,7 +102,7 @@ exports.PanTool = Montage.create(toolBase, { // do one final mouse move to update the scrollbars this.mouseUp( event ); - + this.application.ninja.stage.clearDrawingCanvas(); this._hasDraw = false; this._isDrawing = false; @@ -174,7 +174,7 @@ exports.PanTool = Montage.create(toolBase, this.application.ninja.currentDocument.model.views.design.document.body.scrollLeft += delta; delta *= zoom; - + var uc = this.application.ninja.currentDocument.model.documentRoot; var ucMat = viewUtils.getMatrixFromElement(uc); var offset = viewUtils.getElementOffset( uc ); @@ -231,7 +231,7 @@ exports.PanTool = Montage.create(toolBase, this.doMouseDown( point ); } }, - + doMouseDown: { @@ -378,7 +378,7 @@ exports.PanTool = Montage.create(toolBase, var wPt = MathUtils.transformAndDivideHomogeneousPoint( gPt, this._globalToUCWorld ); var delta = vecUtils.vecSubtract( 3, wPt, this._worldPt ); - + if (!this._altKeyDown) delta[2] = 0; diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index c22e3bc0..7e07680d 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js @@ -148,7 +148,7 @@ exports.PenTool = Montage.create(ShapeTool, { var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(x,y)); var pos; if (getStageWorld){ - pos = (snapManager.snap(point.x, point.y, false)).calculateStageWorldPoint(); + pos = (snapManager.snap(point.x, point.y, false)).calculateStageWorldPoint(); } else { pos = (snapManager.snap(point.x, point.y, false)).getScreenPoint(); } @@ -306,7 +306,7 @@ exports.PenTool = Montage.create(ShapeTool, { //todo NOTE: this will work on Webkit only...IE has different codes (left: 1, middle: 4, right: 2) return; } - + //set the drawing flags (see the drawing-tool.js base class) if (this._canDraw) { this._isDrawing = true; @@ -423,7 +423,7 @@ exports.PenTool = Montage.create(ShapeTool, { console.log("WARNING picked anchor point with incorrect mode"); break; } - + } else { this._selectedSubpath.addAnchor(new AnchorPoint()); var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex()); @@ -568,7 +568,7 @@ exports.PenTool = Montage.create(ShapeTool, { //NOTE: this will work on Webkit only...IE has different codes (left: 1, middle: 4, right: 2) return; } - + //set the cursor to be the default cursor (depending on whether the selected subpath has any points yet) if (this._subtool===this.SUBTOOL_NONE){ if ((this._selectedSubpath && this._selectedSubpath.getNumAnchors()>0 && !this._selectedSubpath.getIsClosed()) @@ -618,7 +618,7 @@ exports.PenTool = Montage.create(ShapeTool, { var selAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex()); var selAnchorPos = selAnchor.getAllPos(); var localTranslation = VecUtils.vecSubtract(3, localMousePos, selAnchorPos[1]); - + if (this._editMode & this.EDIT_ANCHOR) { selAnchor.translateAll(localTranslation[0], localTranslation[1], localTranslation[2]); } @@ -691,7 +691,7 @@ exports.PenTool = Montage.create(ShapeTool, { } //if path is not closed } else if (this._subtool === this.SUBTOOL_PENMINUS && selAnchorAndParamAndCode[2] & this._selectedSubpath.SEL_ANCHOR){ cursor = "url('images/cursors/penCursors/Pen_minus.png') 5 1, default"; - } + } this.application.ninja.stage.drawingCanvas.style.cursor = cursor; } else if (selAnchorAndParamAndCode[2] & this._selectedSubpath.SEL_PATH) { //change the cursor only if we're not in pen-minus subtool @@ -825,7 +825,7 @@ exports.PenTool = Montage.create(ShapeTool, { //TODO this will not work if there are multiple shapes in the same canvas canvas.elementModel.shapeModel.GLGeomObj = subpath; - if(canvas.elementModel.isShape) + if(canvas.elementModel.isShape) { this._doesSelectionChangeNeedHandling = false; //this will ignore the selection change event triggered by the canvas this.application.ninja.selectionController.selectElement(canvas); @@ -841,7 +841,7 @@ exports.PenTool = Montage.create(ShapeTool, { // Check if the selected anchor point of the selected subpath should be snapped to another anchor point // (also sets open subpaths closed if appropriate) // IF the selected subpath does not have a canvas - // + // // Draw the selected subpath anchors and the selected subpath itself in the stage's context // ********************************************************************************************************** HandleLeftButtonUp: { @@ -851,7 +851,7 @@ exports.PenTool = Montage.create(ShapeTool, { if (this._subtool===this.SUBTOOL_PENMINUS){ return; } - + // ******************** snapping *********************** // if there was a snapTarget and a selected anchor, move the anchor to the snap target if (this._snapTargetIndex !== -1 && this._selectedSubpath && this._selectedSubpath.getSelectedAnchorIndex() !== -1) { @@ -903,7 +903,7 @@ exports.PenTool = Montage.create(ShapeTool, { //if (this._selectedSubpath && this._selectedSubpath.getIsClosed() && this._entryEditMode !== this.ENTRY_SELECT_PATH){ // this._selectedSubpath = null; //} - + if (this._selectedSubpath){ this.DrawSubpathAnchors(this._selectedSubpath);//render the subpath anchors on canvas }else{ @@ -937,7 +937,7 @@ exports.PenTool = Montage.create(ShapeTool, { return;//nothing to do } this._selectedSubpath.makeDirty(); - + var bboxMin=null, bboxMax=null; if (this._selectedSubpathCanvas) { //if there already is a subpath canvas, it means the anchor points are in local space @@ -980,7 +980,7 @@ exports.PenTool = Montage.create(ShapeTool, { glmat4.multiply( newMat, tMat, newMat); this._selectedSubpathPlaneMat = newMat; ViewUtils.setMatrixForElement(this._selectedSubpathCanvas, newMat, true); - + //now set the center of the canvas as the center of the bounding box expressed in stage world coordinates var localToStageWorldMat = ViewUtils.getLocalToStageWorldMatrix(this._selectedSubpathCanvas, false, false); this._selectedSubpathCanvasCenter = MathUtils.transformAndDivideHomogeneousPoint(bboxMid, localToStageWorldMat); @@ -1009,7 +1009,7 @@ exports.PenTool = Montage.create(ShapeTool, { currAnchor.setNextPos(localNext[0],localNext[1],localNext[2]); } } - + this._selectedSubpath.makeDirty(); this._selectedSubpath.createSamples(false); this._selectedSubpath.offsetPerBBoxMin(); @@ -1104,10 +1104,10 @@ exports.PenTool = Montage.create(ShapeTool, { handleScroll: { value: function(event) { this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas(); - this.DrawSubpathAnchors(this._selectedSubpath); + this.DrawSubpathAnchors(this._selectedSubpath); } }, - + BuildSecondCtrlPoint:{ value: function(p0, p2, p3) { var baselineOrig = VecUtils.vecSubtract(3, p3, p0); @@ -1199,7 +1199,7 @@ exports.PenTool = Montage.create(ShapeTool, { this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas(); this.DrawSubpathAnchors(this._selectedSubpath); - } //if (this._selectedSubpath && this._selectedSubpath.getSelectedAnchorIndex() !== -1) + } //if (this._selectedSubpath && this._selectedSubpath.getSelectedAnchorIndex() !== -1) } //value: function () { }, //HandleDoubleClick: { @@ -1503,7 +1503,7 @@ exports.PenTool = Montage.create(ShapeTool, { /*if (this.application.ninja.selectedElements.length === 0){ this._entryEditMode = this.ENTRY_SELECT_NONE; } - + else{ for (var i=0;i 2000) this.application.ninja.documentBar.zoomFactor = 2000; else @@ -149,7 +149,7 @@ exports.toolBase = Montage.create(Component, { zoomOut:{ value:function(){ var lowerBoundary ,previousZoomValue; - + previousZoomValue = this.application.ninja.documentBar.zoomFactor ; lowerBoundary = previousZoomValue/1.2 ; diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js index 46e0b49c..3e6f2ac6 100755 --- a/js/tools/Translate3DToolBase.js +++ b/js/tools/Translate3DToolBase.js @@ -170,7 +170,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, matInv = glmat4.inverse(this._startMat, []), nMat = glmat4.multiply(transMat, this._startMat, [] ); // qMat = glmat4.multiply(matInv, nMat, []); - + if(this._mode === 1) { if (len > 1) curMat = target.elementModel.getProperty("mat").slice(); var curInv = glmat4.inverse( curMat, [] ); @@ -313,7 +313,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, eltCtr[2] = 0; eltCtr = vecUtils.vecAdd(3, eltCtr, ctrOffset); } - + this._origin = viewUtils.localToGlobal(eltCtr, this.target); // console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin ); this._updateTargets(); @@ -340,8 +340,8 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, } } }, - - calculateMultiSelOrigin: + + calculateMultiSelOrigin: { value: function() { @@ -472,5 +472,5 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, viewUtils.popViewportObj(); } } - + }); diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js index 08fc34f7..dc3064f0 100755 --- a/js/tools/TranslateObject3DTool.js +++ b/js/tools/TranslateObject3DTool.js @@ -69,7 +69,7 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { this._dragPlane = null; this._clickedOnStage = false; var do3DSnap = true; - + if(this._handleMode === null) { snapManager.enableElementSnap ( true ); @@ -158,7 +158,7 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { } // only do quadrant snapping if the 4 corners of the element are in the drag plane - + var sign = MathUtils.fpSign( vecUtils.vecDot(3,this._dragPlane,[0,0,1]) + this._dragPlane[3] - 1.0); this._shouldUseQuadPt = (sign == 0); diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js index e4f4d5d5..353ee185 100755 --- a/js/tools/drawing-tool-base.js +++ b/js/tools/drawing-tool-base.js @@ -50,7 +50,7 @@ exports.DrawingToolBase = Montage.create(Component, { /** * Used on the initial MouseDown for Drawing Tools - * + * * Returns: An array containing: * 0 - HitRec point * 1 - X value converted to screen point @@ -292,7 +292,7 @@ exports.DrawingToolBase = Montage.create(Component, { // return ({"width":w, "height":h, "planeMat":planeMat, "midPt":midPt}); var s0Offset = s0.slice(0); var s1Offset = s1.slice(0); - + s0Offset[0] += snapManager.getStageWidth() / 2.0; s0Offset[1] += snapManager.getStageHeight() / 2.0; s1Offset[0] += snapManager.getStageWidth() / 2.0; @@ -515,7 +515,7 @@ exports.DrawingToolBase = Montage.create(Component, { value: function( s0In, s1In, planeMat, planeMatInv, fixedS1 ) { var s0 = s0In.slice(0); var s2 = s1In.slice(0); - + // calculate the mid point of the rectangle var midPt = vecUtils.vecAdd(3, s0, s2); @@ -549,7 +549,7 @@ exports.DrawingToolBase = Montage.create(Component, { z = pt[2]*p/(p + pt[2]); var x = pt[0]*(p - z)/p, y = pt[1]*(p - z)/p; - + pt[0] = x; pt[1] = y; pt[2] = z; } @@ -683,6 +683,6 @@ exports.DrawingToolBase = Montage.create(Component, { } } } - + }); diff --git a/js/tools/drawing-tool.js b/js/tools/drawing-tool.js index f587bcd5..a7e585e3 100755 --- a/js/tools/drawing-tool.js +++ b/js/tools/drawing-tool.js @@ -118,7 +118,7 @@ exports.DrawingTool = Montage.create(ToolBase, { value: function (event) { var point; point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); - + if (this.drawingFeedback.mode === "Draw3D") { var do3DSnap; this.application.ninja.stage.clearDrawingCanvas(); @@ -154,12 +154,12 @@ exports.DrawingTool = Montage.create(ToolBase, { this.downPoint.y += this._currentDY; this.currentX += this._currentDX; this.currentY += this._currentDY; - + DrawingToolBase.draw2DRectangle(this.downPoint.x,this.downPoint.y,this.currentX - this.downPoint.x,this.currentY - this.downPoint.y); } else { this._currentX = point.x; this._currentY = point.y; - + DrawingToolBase.draw2DRectangle(this.downPoint.x,this.downPoint.y,point.x - this.downPoint.x,point.y - this.downPoint.y); } @@ -233,7 +233,7 @@ exports.DrawingTool = Montage.create(ToolBase, { return DrawingToolBase.getHitRecPos(this.mouseUpHitRec); } }, - + getDrawingData: { value: function (event) { return DrawingToolBase.getCompletePoints(this.mouseDownHitRec, this.mouseUpHitRec); diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 23185989..2363745b 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js @@ -81,7 +81,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { } } }, - + _getObjectBeingTracked : { value: function(hitRec) @@ -103,7 +103,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { // override in subclasses } }, - + initializeSnapping: { value: function(event) @@ -222,7 +222,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { } } }, - + /* * The parameterization is based on the position of the * snap point in pre-transformed element screen space @@ -313,7 +313,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { var localPt = [x,y,z]; globalPt = viewUtils.localToGlobal( localPt, elt ); - + // add in the delta var hitPt = this.GetObjectHitPoint(); var scrPt = viewUtils.localToGlobal( hitPt, this._clickedObject ); @@ -375,7 +375,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { viewUtils.pushViewportObj( elt ); var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] ); viewUtils.popViewportObj(); - + if(useViewPoint) { return viewPt; @@ -405,7 +405,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { viewUtils.pushViewportObj( elt ); var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] ); viewUtils.popViewportObj(); - + if(useViewPoint) { return viewPt; @@ -593,7 +593,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { } } }, - + doDraw: { value: function(event) { @@ -627,12 +627,12 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { this._mode = 0; } }, - + cleanupSnap: { value: function() { this.mouseDownHitRec = null; this.mouseUpHitRec = null; - + this._dragPlane = null; this._useQuadPt = false; @@ -742,7 +742,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { } }, //------------------------------------------------------------------------- - + //------------------------------------------------------------------------- // Routines to run when tool is selected/deselected Configure: { @@ -867,7 +867,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { if (!this._isDrawing || (this.application.ninja.selectedElements.length == 1)) this.DrawHandles(this._delta); - + if(this._canSnap) { snapManager.drawLastHit(); -- cgit v1.2.3