diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/tools | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/tools')
-rw-r--r-- | js/tools/BrushTool.js | 10 | ||||
-rwxr-xr-x | js/tools/EyedropperTool.js | 3 | ||||
-rwxr-xr-x | js/tools/LineTool.js | 11 | ||||
-rwxr-xr-x | js/tools/PenTool.js | 11 | ||||
-rwxr-xr-x | js/tools/RotateStage3DTool.js | 20 | ||||
-rwxr-xr-x | js/tools/SelectionTool.js | 5 | ||||
-rwxr-xr-x | js/tools/ShapeTool.js | 43 | ||||
-rwxr-xr-x | js/tools/TagTool.js | 218 | ||||
-rwxr-xr-x | js/tools/ZoomTool.js | 4 | ||||
-rwxr-xr-x | js/tools/drawing-tool-base.js | 87 | ||||
-rwxr-xr-x | js/tools/drawing-tool.js | 3 |
11 files changed, 96 insertions, 319 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index ded56ecc..5c334b92 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
@@ -374,13 +374,11 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
374 | return; | 374 | return; |
375 | } | 375 | } |
376 | 376 | ||
377 | var left = Math.round(midPt[0] - 0.5 * w); | ||
378 | var top = Math.round(midPt[1] - 0.5 * h); | ||
379 | |||
380 | if (!canvas) { | 377 | if (!canvas) { |
381 | var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 378 | var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
382 | var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas, true); | 379 | document.application.njUtils.createModelWithShape(newCanvas, "Brushstroke"); |
383 | ElementMediator.addElements(newCanvas, elementModel.data, false); | 380 | var styles = document.application.njUtils.stylesFromDraw(newCanvas, w, h, {midPt: midPt, planeMat: planeMat}); |
381 | this.application.ninja.elementMediator.addElements(newCanvas, styles, false); | ||
384 | 382 | ||
385 | // create all the GL stuff | 383 | // create all the GL stuff |
386 | var world = this.getGLWorld(newCanvas, this._useWebGL); | 384 | var world = this.getGLWorld(newCanvas, this._useWebGL); |
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js index 346975b2..6678e498 100755 --- a/js/tools/EyedropperTool.js +++ b/js/tools/EyedropperTool.js | |||
@@ -375,7 +375,8 @@ exports.EyedropperTool = Montage.create(toolBase, { | |||
375 | var worldData = elt.elementModel.shapeModel.GLWorld.exportJSON(); | 375 | var worldData = elt.elementModel.shapeModel.GLWorld.exportJSON(); |
376 | if(worldData) | 376 | if(worldData) |
377 | { | 377 | { |
378 | this._webGlDataCanvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, true); | 378 | this._webGlDataCanvas = njModule.NJUtils.make("canvas", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
379 | njModule.NJUtils.createModelWithShape(this._webGlDataCanvas, "Canvas"); | ||
379 | this._applyElementStyles(elt, this._webGlDataCanvas, ["display", "position", "width", "height", | 380 | this._applyElementStyles(elt, this._webGlDataCanvas, ["display", "position", "width", "height", |
380 | "-webkit-transform", "-webkit-transform-style"]); | 381 | "-webkit-transform", "-webkit-transform-style"]); |
381 | this._webGlDataCanvas.style.left = eltCoords[0] + "px"; | 382 | this._webGlDataCanvas.style.left = eltCoords[0] + "px"; |
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 3e9167fd..5941b464 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -77,10 +77,11 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
77 | h += ~~(yAdj*2); | 77 | h += ~~(yAdj*2); |
78 | } | 78 | } |
79 | 79 | ||
80 | canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 80 | canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
81 | var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas, true); | 81 | document.application.njUtils.createModelWithShape(canvas, "Line"); |
82 | canvas.elementModel.isShape = true; | 82 | |
83 | this.application.ninja.elementMediator.addElements(canvas, elementModel.data); | 83 | var styles = document.application.njUtils.stylesFromDraw(canvas, w, h, drawData); |
84 | this.application.ninja.elementMediator.addElements(canvas, styles); | ||
84 | } else { | 85 | } else { |
85 | canvas = this._targetedElement; | 86 | canvas = this._targetedElement; |
86 | canvas.elementModel.controller = ShapesController; | 87 | canvas.elementModel.controller = ShapesController; |
@@ -241,7 +242,7 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
241 | canvas.elementModel.shapeModel.shapeCount++; | 242 | canvas.elementModel.shapeModel.shapeCount++; |
242 | if(canvas.elementModel.shapeModel.shapeCount === 1) | 243 | if(canvas.elementModel.shapeModel.shapeCount === 1) |
243 | { | 244 | { |
244 | canvas.elementModel.selection = "Line"; | 245 | // canvas.elementModel.selection = "Line"; |
245 | canvas.elementModel.pi = "LinePi"; | 246 | canvas.elementModel.pi = "LinePi"; |
246 | canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; | 247 | canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; |
247 | 248 | ||
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 8ecc9f79..16990ca7 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -557,17 +557,16 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
557 | return; | 557 | return; |
558 | } | 558 | } |
559 | 559 | ||
560 | w= Math.round(w); | 560 | w = Math.round(w); |
561 | h = Math.round(h); | 561 | h = Math.round(h); |
562 | var left = Math.round(midPt[0] - 0.5 * w); | 562 | var left = Math.round(midPt[0] - 0.5 * w); |
563 | var top = Math.round(midPt[1] - 0.5 * h); | 563 | var top = Math.round(midPt[1] - 0.5 * h); |
564 | 564 | ||
565 | if (!canvas) { | 565 | if (!canvas) { |
566 | var newCanvas = null; | 566 | var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
567 | newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 567 | document.application.njUtils.createModelWithShape(newCanvas, "Subpath"); |
568 | var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, true); | 568 | var styles = document.application.njUtils.stylesFromDraw(newCanvas, parseInt(w), parseInt(h), {midPt: midPt, planeMat: planeMat}); |
569 | //note that we set the notify event to false because we send the event separately at end of this code block | 569 | this.application.ninja.elementMediator.addElements(newCanvas, styles, false); |
570 | ElementMediator.addElements(newCanvas, elementModel.data, false); | ||
571 | 570 | ||
572 | // create all the GL stuff | 571 | // create all the GL stuff |
573 | var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial); | 572 | var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial); |
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js index 2a9c63db..c8818021 100755 --- a/js/tools/RotateStage3DTool.js +++ b/js/tools/RotateStage3DTool.js | |||
@@ -96,12 +96,6 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
96 | viewUtils.pushViewportObj( stage ); | 96 | viewUtils.pushViewportObj( stage ); |
97 | var eltCtr = viewUtils.getCenterOfProjection(); | 97 | var eltCtr = viewUtils.getCenterOfProjection(); |
98 | viewUtils.popViewportObj(); | 98 | viewUtils.popViewportObj(); |
99 | // if(this.application.ninja.documentController.webTemplate) | ||
100 | if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") | ||
101 | { | ||
102 | eltCtr[0] = stage.scrollWidth/2; | ||
103 | eltCtr[1] = stage.scrollHeight/2; | ||
104 | } | ||
105 | 99 | ||
106 | var curMat = viewUtils.getMatrixFromElement(stage); | 100 | var curMat = viewUtils.getMatrixFromElement(stage); |
107 | var curMatInv = glmat4.inverse(curMat, []); | 101 | var curMatInv = glmat4.inverse(curMat, []); |
@@ -118,17 +112,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
118 | } | 112 | } |
119 | 113 | ||
120 | this._origin = viewUtils.localToGlobal(eltCtr, stage); | 114 | this._origin = viewUtils.localToGlobal(eltCtr, stage); |
121 | 115 | this._setTransformOrigin(false); | |
122 | // if(this.application.ninja.documentController.webTemplate) | ||
123 | if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") | ||
124 | { | ||
125 | this._startOriginArray = []; | ||
126 | this._startOriginArray.push(this._origin.slice()); | ||
127 | } | ||
128 | else | ||
129 | { | ||
130 | this._setTransformOrigin(false); | ||
131 | } | ||
132 | this.DrawHandles(); | 116 | this.DrawHandles(); |
133 | } | 117 | } |
134 | }, | 118 | }, |
@@ -155,7 +139,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
155 | // let the document and stage manager know about the zoom change | 139 | // let the document and stage manager know about the zoom change |
156 | this.application.ninja.stage._firstDraw = true; | 140 | this.application.ninja.stage._firstDraw = true; |
157 | this.application.ninja.documentBar.zoomFactor = 100; | 141 | this.application.ninja.documentBar.zoomFactor = 100; |
158 | this.application.ninja.currentDocument.iframe.style.zoom = 1.0; | 142 | this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0; |
159 | this.application.ninja.stage._firstDraw = false; | 143 | this.application.ninja.stage._firstDraw = false; |
160 | 144 | ||
161 | // TODO - Any updates to the stage should redraw stage's children. Move this to mediator? | 145 | // TODO - Any updates to the stage should redraw stage's children. Move this to mediator? |
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 855c7b8c..d3e4ebf9 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -165,10 +165,11 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
165 | box[3] = point.y; | 165 | box[3] = point.y; |
166 | 166 | ||
167 | //selectionManagerModule.selectionManager.marqueeSelection(box); | 167 | //selectionManagerModule.selectionManager.marqueeSelection(box); |
168 | var childNodes = this.application.ninja.currentDocument.documentRoot.childNodes; | 168 | var childNodes = this.application.ninja.currentDocument.documentRoot.childNodes, |
169 | selectionController = this.application.ninja.selectionController; | ||
169 | childNodes = Array.prototype.slice.call(childNodes, 0); | 170 | childNodes = Array.prototype.slice.call(childNodes, 0); |
170 | childNodes.forEach(function(item) { | 171 | childNodes.forEach(function(item) { |
171 | if(item.nodeType == 1 && SelectionTool._complicatedCollisionDetection(item, box)) { | 172 | if(selectionController.isNodeTraversable(item) && SelectionTool._complicatedCollisionDetection(item, box)) { |
172 | selectedItems.push(item); | 173 | selectedItems.push(item); |
173 | } | 174 | } |
174 | }); | 175 | }); |
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index 8f45891d..0562dbc2 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -53,23 +53,17 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
53 | } | 53 | } |
54 | }, | 54 | }, |
55 | 55 | ||
56 | HandleLeftButtonUp: | 56 | HandleLeftButtonUp: { |
57 | { | 57 | value: function (event) { |
58 | value: function (event) | 58 | var canvas, drawData = this.getDrawingData(); |
59 | { | ||
60 | var drawData; | ||
61 | |||
62 | drawData = this.getDrawingData(); | ||
63 | 59 | ||
64 | if(drawData) { | 60 | if(drawData) { |
65 | var canvas; | ||
66 | if(!this._useExistingCanvas()) { | 61 | if(!this._useExistingCanvas()) { |
67 | canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); | 62 | canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
68 | var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height, | 63 | document.application.njUtils.createModelWithShape(canvas); |
69 | drawData.planeMat, drawData.midPt, canvas, true); | ||
70 | 64 | ||
71 | canvas.elementModel.isShape = true; | 65 | var styles = document.application.njUtils.stylesFromDraw(canvas, ~~drawData.width, ~~drawData.height, drawData); |
72 | this.application.ninja.elementMediator.addElements(canvas, elementModel.data); | 66 | this.application.ninja.elementMediator.addElements(canvas, styles); |
73 | } else { | 67 | } else { |
74 | canvas = this._targetedElement; | 68 | canvas = this._targetedElement; |
75 | if (!canvas.getAttribute( "data-RDGE-id" )) | 69 | if (!canvas.getAttribute( "data-RDGE-id" )) |
@@ -106,6 +100,9 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
106 | if(wasSelected) { | 100 | if(wasSelected) { |
107 | this.AddCustomFeedback(); | 101 | this.AddCustomFeedback(); |
108 | this.application.ninja.elementMediator.addDelegate = this; | 102 | this.application.ninja.elementMediator.addDelegate = this; |
103 | if(this.application.ninja.currentSelectedContainer.nodeName === "CANVAS") { | ||