From fc13ef1e806116bb7ece5bb06604fa4f5714a6ed Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 19 Jul 2012 10:55:22 -0700 Subject: Squashed commit of the following: commit 0285afe3d4bd458a51f11241f13ea6ffdb0283ed Merge: 2f9f5e3 16d06ba Author: Nivesh Rajbhandari Date: Thu Jul 19 10:54:25 2012 -0700 Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations commit 2f9f5e369eb96f6c81b5e4bcbe09b418825e2864 Author: Nivesh Rajbhandari Date: Wed Jul 18 17:15:19 2012 -0700 Fixed selection bounds not drawing in nested tags. Signed-off-by: Nivesh Rajbhandari commit b0a3507f9d27579ad511c69314a09136d7f7c6a0 Author: Nivesh Rajbhandari Date: Wed Jul 18 11:07:44 2012 -0700 Layout info needs to redraw if stage is updated. Signed-off-by: Nivesh Rajbhandari commit 63c5e0bf52c33706ba597cb69f7794e287bd0f06 Author: Nivesh Rajbhandari Date: Tue Jul 17 15:40:54 2012 -0700 Per feedback from QE, we are still going to draw tool feedback on each mouse move so the selection bounds are not out of sync with the elements. Signed-off-by: Nivesh Rajbhandari commit 0599a742092b985c4002977e501e3b457173f1d9 Author: Nivesh Rajbhandari Date: Tue Jul 17 15:28:25 2012 -0700 Fixed grid not drawing correctly when switching documents and when adding/removing elements. Signed-off-by: Nivesh Rajbhandari commit fd9410606ee6358910d65b2cb5f71812fd44a7c4 Author: Nivesh Rajbhandari Date: Tue Jul 17 11:36:09 2012 -0700 Updated drawing feedback to handle matrix 2d values entered via CSS Panel. Signed-off-by: Nivesh Rajbhandari commit 559c16c7ac8c9f40b94a011a6f932d4f97df66a7 Author: Nivesh Rajbhandari Date: Mon Jul 16 17:14:28 2012 -0700 IKNinja-751 - Selection boundary doesn't follow the transform applied in the CSS Panel. Signed-off-by: Nivesh Rajbhandari commit e2da5340159db5cd6f75bf6c9b7eb9cbf959e5cd Merge: 7cc5de3 5146f22 Author: Nivesh Rajbhandari Date: Mon Jul 16 15:36:28 2012 -0700 Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations commit 7cc5de39e41b4220f53c91b15b0cf0ed53e0b0f6 Author: Nivesh Rajbhandari Date: Mon Jul 16 14:52:06 2012 -0700 Check if ownerDocument.defaultValue is null. Signed-off-by: Nivesh Rajbhandari commit 5ae97995a28a4b06fb7f8703eb8090ea16d88acd Merge: d17974d 0ede302 Author: Nivesh Rajbhandari Date: Mon Jul 16 09:27:22 2012 -0700 Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations commit d17974d77273bb635311cb6466f4427cf4d9e5d4 Author: Nivesh Rajbhandari Date: Mon Jul 16 08:45:05 2012 -0700 Pass in selectedElements array directly to drawUtils when drawing selection bounds instead of creating a duplicate array. Signed-off-by: Nivesh Rajbhandari commit 0b1ea3144cb3e2c1d272f60da32423d0604ace3b Author: Nivesh Rajbhandari Date: Fri Jul 13 14:03:40 2012 -0700 Fixed line tool not drawing the width and height info. Signed-off-by: Nivesh Rajbhandari commit b9c70e8d9ae324aa21fa5490edc71d8503bcefbc Author: Nivesh Rajbhandari Date: Fri Jul 13 12:42:25 2012 -0700 Used cached offsetWidth and offsetHeight. Signed-off-by: Nivesh Rajbhandari commit 9e17ac7124745ba745014efe149b31dee4fe658f Author: Nivesh Rajbhandari Date: Thu Jul 12 16:25:41 2012 -0700 Converting tabs to spaces … again! Signed-off-by: Nivesh Rajbhandari commit 351726c951bb73c28f0e15ea1ab32e85cc735688 Author: Nivesh Rajbhandari Date: Thu Jul 12 16:14:31 2012 -0700 Tabs should be 4 spaces. Signed-off-by: Nivesh Rajbhandari commit 250c419aa2dbcb10f012817ee7039aca77cb2518 Merge: 3f8d61a 2880e1d Author: Nivesh Rajbhandari Date: Thu Jul 12 16:08:31 2012 -0700 Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations commit 3f8d61a676da3992947ed9a2ed0e449780fcfbe0 Author: Nivesh Rajbhandari Date: Thu Jul 12 15:53:44 2012 -0700 Rotate tool was not working immediately after switching selection and selection bounds were not drawing after resizing canvases. Signed-off-by: Nivesh Rajbhandari commit e2e1f81e3b6917e1032e1b99b79c266937f3bb25 Author: Nivesh Rajbhandari Date: Thu Jul 12 12:15:59 2012 -0700 Single draw cycle for stage updates and tool drawings. Signed-off-by: Nivesh Rajbhandari commit 95a90b4c95ee3163c97bea317144366674e49ade Author: Nivesh Rajbhandari Date: Mon Jun 18 11:46:38 2012 -0700 Single draw cycle for the stage and layout. Signed-off-by: Nivesh Rajbhandari commit 21966b1515d80d2161a14e5a19bc66f3f49a92ce Author: Nivesh Rajbhandari Date: Fri Jun 15 13:33:14 2012 -0700 Cache element offsets, including offsetParent. Signed-off-by: Nivesh Rajbhandari commit 80c563c8ba06149691c6c1e754dd9a5e43bc7d4b Author: Nivesh Rajbhandari Date: Mon Jul 9 17:30:00 2012 -0700 Open materials editor popup next to PI button. Signed-off-by: Nivesh Rajbhandari Signed-off-by: Nivesh Rajbhandari --- js/tools/SelectionTool.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/tools/SelectionTool.js') diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 923ed819..a136113b 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js @@ -102,7 +102,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { } this.isDrawing = true; - this.application.ninja.stage.showSelectionBounds = false; this._use3DMode = false; @@ -183,7 +182,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); this.isDrawing = false; - this.application.ninja.stage.showSelectionBounds = true; if(this._escape) { this._escape = false; this._isSelecting = false; -- cgit v1.2.3 From 55a69aeb3c66b533d5a2d27d7548471c2c8b5dfc Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 24 Jul 2012 00:24:20 -0700 Subject: jshint cleanup on the tools directory Signed-off-by: Valerio Virgillito --- js/tools/SelectionTool.js | 103 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 51 deletions(-) (limited to 'js/tools/SelectionTool.js') diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index a136113b..07ae8cf5 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js @@ -272,7 +272,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { HandleKeyPress: { value: function(event){ - var inc; + var inc, newLeft, leftArr, newTop, topArr; if (!(event.target instanceof HTMLInputElement)) { if(this.application.ninja.selectedElements.length !== 0) { @@ -280,36 +280,36 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { switch(event.keyCode) { case Keyboard.LEFT: - var newLeft = []; - var leftArr = this.application.ninja.selectedElements.map(function(item) { - newLeft.push( (parseInt(ElementsMediator.getProperty(item, "left")) - inc) + "px" ); + newLeft = []; + leftArr = this.application.ninja.selectedElements.map(function(item) { + newLeft.push( (parseInt(ElementsMediator.getProperty(item, "left"), 10) - inc) + "px" ); return ElementsMediator.getProperty(item, "left"); }); ElementsMediator.setProperty(this.application.ninja.selectedElements, "left", newLeft , "Change", "selectionTool", leftArr); break; case Keyboard.UP: - var newTop = []; - var topArr = this.application.ninja.selectedElements.map(function(item) { - newTop.push( (parseInt(ElementsMediator.getProperty(item, "top")) - inc) + "px" ); + newTop = []; + topArr = this.application.ninja.selectedElements.map(function(item) { + newTop.push( (parseInt(ElementsMediator.getProperty(item, "top"), 10) - inc) + "px" ); return ElementsMediator.getProperty(item, "top"); }); ElementsMediator.setProperty(this.application.ninja.selectedElements, "top", newTop , "Change", "selectionTool", topArr); break; case Keyboard.RIGHT: - var newLeft = []; - var leftArr = this.application.ninja.selectedElements.map(function(item) { - newLeft.push( (parseInt(ElementsMediator.getProperty(item, "left")) + inc) + "px" ); + newLeft = []; + leftArr = this.application.ninja.selectedElements.map(function(item) { + newLeft.push( (parseInt(ElementsMediator.getProperty(item, "left"), 10) + inc) + "px" ); return ElementsMediator.getProperty(item, "left"); }); ElementsMediator.setProperty(this.application.ninja.selectedElements, "left", newLeft , "Change", "selectionTool", leftArr); break; case Keyboard.DOWN: - var newTop = []; - var topArr = this.application.ninja.selectedElements.map(function(item) { - newTop.push( (parseInt(ElementsMediator.getProperty(item, "top")) + inc) + "px" ); + newTop = []; + topArr = this.application.ninja.selectedElements.map(function(item) { + newTop.push( (parseInt(ElementsMediator.getProperty(item, "top"), 10) + inc) + "px" ); return ElementsMediator.getProperty(item, "top"); }); @@ -317,7 +317,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { break; default: return false; - break; } @@ -339,17 +338,17 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { var modObject = [], mod3dObject = [], self = this; this.application.ninja.selectedElements.forEach(function(element) { - + var prevW, prevH, w, h; if(addToUndo) { if(!self._use3DMode) { var prevX = element.elementModel.getProperty("x"); var prevY = element.elementModel.getProperty("y"); - var prevW = element.elementModel.getProperty("w"); - var prevH = element.elementModel.getProperty("h"); + prevW = element.elementModel.getProperty("w"); + prevH = element.elementModel.getProperty("h"); var x = ElementsMediator.getProperty(element, "left"); var y = ElementsMediator.getProperty(element, "top"); - var w = ElementsMediator.getProperty(element, "width"); - var h = ElementsMediator.getProperty(element, "height"); + w = ElementsMediator.getProperty(element, "width"); + h = ElementsMediator.getProperty(element, "height"); // if we have a delta, that means the transform handles were used and // we should update the width and height too. Otherwise, just update left and top. @@ -362,10 +361,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { } else { // Not using the 3d mode var previousMat = element.elementModel.getProperty("mat").slice(0); - var prevW = element.elementModel.getProperty("w"); - var prevH = element.elementModel.getProperty("h"); - var w = ElementsMediator.getProperty(element, "width"); - var h = ElementsMediator.getProperty(element, "height"); + prevW = element.elementModel.getProperty("w"); + prevH = element.elementModel.getProperty("h"); + w = ElementsMediator.getProperty(element, "width"); + h = ElementsMediator.getProperty(element, "height"); var previousStyleStr = {dist:element.elementModel.getProperty("dist"), mat:MathUtils.scientificToDecimal(previousMat, 5)}; var newStyleStr = {dist:viewUtils.getPerspectiveDistFromElement(element), mat:MathUtils.scientificToDecimal(viewUtils.getMatrixFromElement(element), 5)}; @@ -421,8 +420,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { viewUtils.setMatrixForElement( element, curMat, true); element.elementModel.setProperty("mat", curMat); } else { - var x = (parseInt(ElementsMediator.getProperty(element, "left")) + transMat[12]) + "px"; - var y = (parseInt(ElementsMediator.getProperty(element, "top")) + transMat[13]) + "px"; + var x = (parseInt(ElementsMediator.getProperty(element, "left"), 10) + transMat[12]) + "px"; + var y = (parseInt(ElementsMediator.getProperty(element, "top"), 10) + transMat[13]) + "px"; targets.push({element:element, properties:{left:x , top:y}}); } @@ -452,21 +451,21 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // Resize North-West this.application.ninja.selectedElements.forEach(function(element) { delta = ~~(data.pt1[0] - data.pt0[0]); - width = parseInt(element.elementModel.getProperty("w")) - delta; + width = parseInt(element.elementModel.getProperty("w"), 10) - delta; if(width <= 0) { width = 1; - left = parseInt(element.elementModel.getProperty("x")) + parseInt(element.elementModel.getProperty("w")) - 1; + left = parseInt(element.elementModel.getProperty("x"), 10) + parseInt(element.elementModel.getProperty("w"), 10) - 1; } else { - left = parseInt(element.elementModel.getProperty("x")) + delta; + left = parseInt(element.elementModel.getProperty("x"), 10) + delta; } delta = ~~(data.pt1[1] - data.pt0[1]); - height = parseInt(element.elementModel.getProperty("h")) - delta; + height = parseInt(element.elementModel.getProperty("h"), 10) - delta; if(height <= 0) { height = 1; - top = parseInt(element.elementModel.getProperty("y")) + parseInt(element.elementModel.getProperty("h")) - 1; + top = parseInt(element.elementModel.getProperty("y"), 10) + parseInt(element.elementModel.getProperty("h"), 10) - 1; } else { - top = parseInt(element.elementModel.getProperty("y")) + delta; + top = parseInt(element.elementModel.getProperty("y"), 10) + delta; } modObject.push({element:element, properties:{width: width + "px", height: height + "px", left: left + "px", top: top + "px"}}); }); @@ -475,12 +474,12 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // Resize West this.application.ninja.selectedElements.forEach(function(element) { delta = ~~(data.pt1[0] - data.pt0[0]); - width = parseInt(element.elementModel.getProperty("w")) - delta; + width = parseInt(element.elementModel.getProperty("w"), 10) - delta; if(width <= 0) { width = 1; - left = parseInt(element.elementModel.getProperty("x")) + parseInt(element.elementModel.getProperty("w")) - 1; + left = parseInt(element.elementModel.getProperty("x"), 10) + parseInt(element.elementModel.getProperty("w"), 10) - 1; } else { - left = parseInt(element.elementModel.getProperty("x")) + delta; + left = parseInt(element.elementModel.getProperty("x"), 10) + delta; } modObject.push({element:element, properties:{left: left + "px", width: width + "px"}}); }); @@ -489,15 +488,15 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // Resize South-West this.application.ninja.selectedElements.forEach(function(element) { delta = ~~(data.pt1[0] - data.pt0[0]); - width = parseInt(element.elementModel.getProperty("w")) - delta; + width = parseInt(element.elementModel.getProperty("w"), 10) - delta; if(width <= 0) { width = 1; - left = parseInt(element.elementModel.getProperty("x")) + parseInt(element.elementModel.getProperty("w")) - 1; + left = parseInt(element.elementModel.getProperty("x"), 10) + parseInt(element.elementModel.getProperty("w"), 10) - 1; } else { - left = parseInt(element.elementModel.getProperty("x")) + delta; + left = parseInt(element.elementModel.getProperty("x"), 10) + delta; } delta = ~~(data.pt1[1] - data.pt0[1]); - height = parseInt(element.elementModel.getProperty("h")) + delta; + height = parseInt(element.elementModel.getProperty("h"), 10) + delta; if(height <= 0) { height = 1; } @@ -508,7 +507,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // Resize South this.application.ninja.selectedElements.forEach(function(element) { delta = ~~(data.pt1[1] - data.pt0[1]); - height = parseInt(element.elementModel.getProperty("h")) + delta; + height = parseInt(element.elementModel.getProperty("h"), 10) + delta; if(height <= 0) { height = 1; } @@ -519,12 +518,12 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // Resize South-East this.application.ninja.selectedElements.forEach(function(element) { delta = ~~(data.pt1[0] - data.pt0[0]); - width = parseInt(element.elementModel.getProperty("w")) + delta; + width = parseInt(element.elementModel.getProperty("w"), 10) + delta; if(width <= 0) { width = 1; } delta = ~~(data.pt1[1] - data.pt0[1]); - height = parseInt(element.elementModel.getProperty("h")) + delta; + height = parseInt(element.elementModel.getProperty("h"), 10) + delta; if(height <= 0) { height = 1; } @@ -535,7 +534,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // Resize East this.application.ninja.selectedElements.forEach(function(element) { delta = ~~(data.pt1[0] - data.pt0[0]); - width = parseInt(element.elementModel.getProperty("w")) + delta; + width = parseInt(element.elementModel.getProperty("w"), 10) + delta; if(width <= 0) { width = 1; } @@ -546,17 +545,17 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // Resize North-East this.application.ninja.selectedElements.forEach(function(element) { delta = ~~(data.pt1[0] - data.pt0[0]); - width = parseInt(element.elementModel.getProperty("w")) + delta; + width = parseInt(element.elementModel.getProperty("w"), 10) + delta; if(width <= 0) { width = 1; } delta = ~~(data.pt1[1] - data.pt0[1]); - height = parseInt(element.elementModel.getProperty("h")) - delta; + height = parseInt(element.elementModel.getProperty("h"), 10) - delta; if(height <= 0) { height = 1; - top = parseInt(element.elementModel.getProperty("y")) + parseInt(element.elementModel.getProperty("h")) - 1; + top = parseInt(element.elementModel.getProperty("y"), 10) + parseInt(element.elementModel.getProperty("h"), 10) - 1; } else { - top = parseInt(element.elementModel.getProperty("y")) + delta; + top = parseInt(element.elementModel.getProperty("y"), 10) + delta; } modObject.push({element:element, properties:{width: width + "px", height: height + "px", top: top + "px"}}); }); @@ -565,12 +564,12 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { // Resize North this.application.ninja.selectedElements.forEach(function(element) { delta = ~~(data.pt1[1] - data.pt0[1]); - height = parseInt(element.elementModel.getProperty("h")) - delta; + height = parseInt(element.elementModel.getProperty("h"), 10) - delta; if(height <= 0) { height = 1; - top = parseInt(element.elementModel.getProperty("y")) + parseInt(element.elementModel.getProperty("h")) - 1; + top = parseInt(element.elementModel.getProperty("y"), 10) + parseInt(element.elementModel.getProperty("h"), 10) - 1; } else { - top = parseInt(element.elementModel.getProperty("y")) + delta; + top = parseInt(element.elementModel.getProperty("y"), 10) + delta; } modObject.push({element:element, properties:{height: height + "px", top: top + "px"}}); }); @@ -657,10 +656,12 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { y0 = bounds[0][1], y1 = bounds[1][1]; var dx = x1 - x0, dy = y1 - y0; var u = 0, v = 0; - if (MathUtils.fpSign(dx) != 0) + if (MathUtils.fpSign(dx) !== 0) { u = (scrPt[0] - x0) / dx; - if (MathUtils.fpSign(dy) != 0) + } + if (MathUtils.fpSign(dy) !== 0) { v = (scrPt[1] - y0) / dy; + } paramPt[0] = u; paramPt[1] = v; -- cgit v1.2.3