diff options
author | Valerio Virgillito | 2012-06-05 21:40:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-05 21:40:44 -0700 |
commit | e28eb9158a50d7e6d97dbc68066e591ac600c241 (patch) | |
tree | 1615affe62374ae67eaecb8b1966a2f464559dfa /js/tools | |
parent | d7555c35b357e28a1e1ccc1c4edc4fe04d2b139a (diff) | |
download | ninja-e28eb9158a50d7e6d97dbc68066e591ac600c241.tar.gz |
removing all model creators.
The elementModel is now a getter that will create a new model when needed.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/tools')
-rw-r--r-- | js/tools/BrushTool.js | 1 | ||||
-rwxr-xr-x | js/tools/EyedropperTool.js | 1 | ||||
-rwxr-xr-x | js/tools/LineTool.js | 1 | ||||
-rwxr-xr-x | js/tools/PenTool.js | 1 | ||||
-rwxr-xr-x | js/tools/ShapeTool.js | 1 | ||||
-rwxr-xr-x | js/tools/TagTool.js | 3 |
6 files changed, 0 insertions, 8 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index 0be378fd..f7c8ea1e 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
@@ -376,7 +376,6 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
376 | 376 | ||
377 | if (!canvas) { | 377 | if (!canvas) { |
378 | var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); | 378 | var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
379 | document.application.njUtils.createModelWithShape(newCanvas, "Brushstroke"); | ||
380 | var styles = document.application.njUtils.stylesFromDraw(newCanvas, w, h, {midPt: midPt, planeMat: planeMat}); | 379 | var styles = document.application.njUtils.stylesFromDraw(newCanvas, w, h, {midPt: midPt, planeMat: planeMat}); |
381 | this.application.ninja.elementMediator.addElements(newCanvas, styles, false); | 380 | this.application.ninja.elementMediator.addElements(newCanvas, styles, false); |
382 | 381 | ||
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js index 6678e498..6a56004d 100755 --- a/js/tools/EyedropperTool.js +++ b/js/tools/EyedropperTool.js | |||
@@ -376,7 +376,6 @@ exports.EyedropperTool = Montage.create(toolBase, { | |||
376 | if(worldData) | 376 | if(worldData) |
377 | { | 377 | { |
378 | this._webGlDataCanvas = njModule.NJUtils.make("canvas", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, this.application.ninja.currentDocument); | 378 | this._webGlDataCanvas = njModule.NJUtils.make("canvas", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
379 | njModule.NJUtils.createModelWithShape(this._webGlDataCanvas, "Canvas"); | ||
380 | this._applyElementStyles(elt, this._webGlDataCanvas, ["display", "position", "width", "height", | 379 | this._applyElementStyles(elt, this._webGlDataCanvas, ["display", "position", "width", "height", |
381 | "-webkit-transform", "-webkit-transform-style"]); | 380 | "-webkit-transform", "-webkit-transform-style"]); |
382 | this._webGlDataCanvas.style.left = eltCoords[0] + "px"; | 381 | this._webGlDataCanvas.style.left = eltCoords[0] + "px"; |
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index b2b48383..56d03e81 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -78,7 +78,6 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
78 | } | 78 | } |
79 | 79 | ||
80 | canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); | 80 | canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
81 | document.application.njUtils.createModelWithShape(canvas, "Line"); | ||
82 | 81 | ||
83 | var styles = document.application.njUtils.stylesFromDraw(canvas, w, h, drawData); | 82 | var styles = document.application.njUtils.stylesFromDraw(canvas, w, h, drawData); |
84 | this.application.ninja.elementMediator.addElements(canvas, styles); | 83 | this.application.ninja.elementMediator.addElements(canvas, styles); |
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 3813123a..24436352 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -564,7 +564,6 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
564 | 564 | ||
565 | if (!canvas) { | 565 | if (!canvas) { |
566 | var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); | 566 | var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
567 | document.application.njUtils.createModelWithShape(newCanvas, "Subpath"); | ||
568 | var styles = document.application.njUtils.stylesFromDraw(newCanvas, parseInt(w), parseInt(h), {midPt: midPt, planeMat: planeMat}); | 567 | var styles = document.application.njUtils.stylesFromDraw(newCanvas, parseInt(w), parseInt(h), {midPt: midPt, planeMat: planeMat}); |
569 | this.application.ninja.elementMediator.addElements(newCanvas, styles, false); | 568 | this.application.ninja.elementMediator.addElements(newCanvas, styles, false); |
570 | 569 | ||
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index 367ab78d..6956aea8 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -60,7 +60,6 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
60 | if(drawData) { | 60 | if(drawData) { |
61 | if(!this._useExistingCanvas()) { | 61 | if(!this._useExistingCanvas()) { |
62 | canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); | 62 | canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument); |
63 | document.application.njUtils.createModelWithShape(canvas); | ||
64 | 63 | ||
65 | var styles = document.application.njUtils.stylesFromDraw(canvas, ~~drawData.width, ~~drawData.height, drawData); | 64 | var styles = document.application.njUtils.stylesFromDraw(canvas, ~~drawData.width, ~~drawData.height, drawData); |
66 | this.application.ninja.elementMediator.addElements(canvas, styles); | 65 | this.application.ninja.elementMediator.addElements(canvas, styles); |
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js index 5520fa89..d56566cf 100755 --- a/js/tools/TagTool.js +++ b/js/tools/TagTool.js | |||
@@ -86,9 +86,6 @@ exports.TagTool = Montage.create(DrawingTool, { | |||
86 | element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument); | 86 | element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument); |
87 | } | 87 | } |
88 | 88 | ||
89 | // Create the model | ||
90 | document.application.njUtils.createModel(element); | ||
91 | |||
92 | // Create the styles | 89 | // Create the styles |
93 | styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData); | 90 | styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData); |
94 | 91 | ||