diff options
author | Nivesh Rajbhandari | 2012-05-01 09:17:07 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-01 09:17:07 -0700 |
commit | 286836b141f14e45d74e70ee00ba129480d2fe7f (patch) | |
tree | 195a57f7fa1eb9c48fa5bcf779516cdc759b74c6 /js | |
parent | c534f70e9af920d252d0d94151c9d6f884283b81 (diff) | |
parent | fb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff) | |
download | ninja-286836b141f14e45d74e70ee00ba129480d2fe7f.tar.gz |
Merge branch 'refs/heads/ninja-internal' into StageWebTemplate
Diffstat (limited to 'js')
-rwxr-xr-x | js/tools/SelectionTool.js | 2 | ||||
-rwxr-xr-x | js/tools/ShapeTool.js | 2 | ||||
-rwxr-xr-x | js/tools/drawing-tool-base.js | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index f7b583b5..855c7b8c 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -222,10 +222,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
222 | value: function(event) { | 222 | value: function(event) { |
223 | if(this.application.ninja.selectedElements.length > 0) { | 223 | if(this.application.ninja.selectedElements.length > 0) { |
224 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; | 224 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; |
225 | console.log( "setting container to selected element" ); | ||
226 | } else { | 225 | } else { |
227 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; | 226 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; |
228 | console.log( "setting container to stage" ); | ||
229 | } | 227 | } |
230 | } | 228 | } |
231 | }, | 229 | }, |
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index c0681200..8f45891d 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -64,7 +64,6 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
64 | if(drawData) { | 64 | if(drawData) { |
65 | var canvas; | 65 | var canvas; |
66 | if(!this._useExistingCanvas()) { | 66 | if(!this._useExistingCanvas()) { |
67 | console.log( "creating a new canvas" ); | ||
68 | canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 67 | canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); |
69 | var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height, | 68 | var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height, |
70 | drawData.planeMat, drawData.midPt, canvas, true); | 69 | drawData.planeMat, drawData.midPt, canvas, true); |
@@ -72,7 +71,6 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
72 | canvas.elementModel.isShape = true; | 71 | canvas.elementModel.isShape = true; |
73 | this.application.ninja.elementMediator.addElements(canvas, elementModel.data); | 72 | this.application.ninja.elementMediator.addElements(canvas, elementModel.data); |
74 | } else { | 73 | } else { |
75 | console.log( "inserting shape into container" ); | ||
76 | canvas = this._targetedElement; | 74 | canvas = this._targetedElement; |
77 | if (!canvas.getAttribute( "data-RDGE-id" )) | 75 | if (!canvas.getAttribute( "data-RDGE-id" )) |
78 | canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() ); | 76 | canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() ); |
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js index 2e652d42..0b51aa28 100755 --- a/js/tools/drawing-tool-base.js +++ b/js/tools/drawing-tool-base.js | |||
@@ -53,7 +53,6 @@ exports.DrawingToolBase = Montage.create(Montage, { | |||
53 | { | 53 | { |
54 | dragPlane = snapManager.setupDragPlanes( hitRec ); | 54 | dragPlane = snapManager.setupDragPlanes( hitRec ); |
55 | } | 55 | } |
56 | console.log( "drag plane: " + dragPlane ); | ||
57 | 56 | ||
58 | var wpHitRec = hitRec.convertToWorkingPlane( dragPlane ); | 57 | var wpHitRec = hitRec.convertToWorkingPlane( dragPlane ); |
59 | var pt = hitRec.getScreenPoint(); | 58 | var pt = hitRec.getScreenPoint(); |