aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
Diffstat (limited to 'js/tools')
-rw-r--r--js/tools/FillTool.js20
-rw-r--r--js/tools/LineTool.js9
-rw-r--r--js/tools/OvalTool.js15
-rw-r--r--js/tools/RectTool.js15
-rw-r--r--js/tools/ShapeTool.js1
-rw-r--r--js/tools/TagTool.js12
6 files changed, 42 insertions, 30 deletions
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 477966da..fabcec69 100644
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -54,10 +54,24 @@ exports.FillTool = Montage.create(ModifierToolBase, {
54 value: function(event) { 54 value: function(event) {
55 this.isDrawing = true; 55 this.isDrawing = true;
56 56
57 if(this._canColor) 57 if(this._canColor && this.application.ninja.selectedElements.length)
58 { 58 {
59 var color = this.application.ninja.colorController.colorToolbar.fill; 59 var color = this.application.ninja.colorController.colorToolbar.fill,
60 ElementsMediator.setColor(this.application.ninja.selectedElements, color, true, "Change", "fillTool"); 60 colorInfo;
61 if(color && color.color)
62 {
63 colorInfo = { mode:color.colorMode,
64 color:color.color
65 };
66 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
67 }
68 else
69 {
70 colorInfo = { mode:"nocolor",
71 color:color.color
72 };
73 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
74 }
61 } 75 }
62 } 76 }
63 } 77 }
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index a0d5a182..99c374a7 100644
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -99,6 +99,7 @@ exports.LineTool = Montage.create(ShapeTool, {
99 } 99 }
100 this.RenderShape(w, h, drawData.planeMat, drawData.midPt, 100 this.RenderShape(w, h, drawData.planeMat, drawData.midPt,
101 canvas, slope, xAdj, yAdj); 101 canvas, slope, xAdj, yAdj);
102 NJevent("elementAdded", canvas);
102 } 103 }
103 104
104 this.endDraw(event); 105 this.endDraw(event);
@@ -202,10 +203,10 @@ exports.LineTool = Montage.create(ShapeTool, {
202 // for default stroke and fill/no materials 203 // for default stroke and fill/no materials
203 var strokeMaterial = null; 204 var strokeMaterial = null;
204 205
205 var strokeIndex = parseInt(this.options.strokeMaterial); 206 var strokeM = this.options.strokeMaterial;
206 if(strokeIndex > 0) 207 if(strokeM)
207 { 208 {
208 strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1)); 209 strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
209 } 210 }
210 211
211 var world = this.getGLWorld(canvas, this.options.use3D); 212 var world = this.getGLWorld(canvas, this.options.use3D);
@@ -231,12 +232,12 @@ exports.LineTool = Montage.create(ShapeTool, {
231 } 232 }
232 233
233 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; 234 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
234 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
235 235
236 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex; 236 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
237 canvas.elementModel.shapeModel.strokeStyle = strokeStyle; 237 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
238 238
239 canvas.elementModel.shapeModel.GLGeomObj = line; 239 canvas.elementModel.shapeModel.GLGeomObj = line;
240 canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
240 } 241 }
241 else 242 else
242 { 243 {
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 2fa5411b..14655312 100644
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -43,16 +43,16 @@ exports.OvalTool = Montage.create(ShapeTool, {
43 var strokeMaterial = null; 43 var strokeMaterial = null;
44 var fillMaterial = null; 44 var fillMaterial = null;
45 45
46 var strokeIndex = parseInt(this.options.strokeMaterial); 46 var strokeM = this.options.strokeMaterial;
47 if(strokeIndex > 0) 47 if(strokeM)
48 { 48 {
49 strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1)); 49 strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
50 } 50 }
51 51
52 var fillIndex = parseInt(this.options.fillMaterial); 52 var fillM = this.options.fillMaterial;
53 if(fillIndex > 0) 53 if(fillM)
54 { 54 {
55 fillMaterial = Object.create(MaterialsLibrary.getMaterialAt(fillIndex-1)); 55 fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM));
56 } 56 }
57 57
58 58
@@ -88,13 +88,12 @@ exports.OvalTool = Montage.create(ShapeTool, {
88 88
89 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; 89 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
90 canvas.elementModel.shapeModel.fillMaterial = fillMaterial; 90 canvas.elementModel.shapeModel.fillMaterial = fillMaterial;
91 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
92 canvas.elementModel.shapeModel.fillMaterialIndex = fillIndex;
93 91
94 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex; 92 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
95 canvas.elementModel.shapeModel.strokeStyle = strokeStyle; 93 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
96 94
97 canvas.elementModel.shapeModel.GLGeomObj = oval; 95 canvas.elementModel.shapeModel.GLGeomObj = oval;
96 canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
98 } 97 }
99 else 98 else
100 { 99 {
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index 94d80b53..31ac7faa 100644
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -62,16 +62,16 @@ exports.RectTool = Montage.create(ShapeTool, {
62 var strokeMaterial = null; 62 var strokeMaterial = null;
63 var fillMaterial = null; 63 var fillMaterial = null;
64 64
65 var strokeIndex = parseInt(this.options.strokeMaterial); 65 var strokeM = this.options.strokeMaterial;
66 if(strokeIndex > 0) 66 if(strokeM)
67 { 67 {
68 strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1)); 68 strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
69 } 69 }
70 70
71 var fillIndex = parseInt(this.options.fillMaterial); 71 var fillM = this.options.fillMaterial;
72 if(fillIndex > 0) 72 if(fillM)
73 { 73 {
74 fillMaterial = Object.create(MaterialsLibrary.getMaterialAt(fillIndex-1)); 74 fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM));
75 } 75 }
76 76
77 var world = this.getGLWorld(canvas, this.options.use3D); 77 var world = this.getGLWorld(canvas, this.options.use3D);
@@ -110,13 +110,12 @@ exports.RectTool = Montage.create(ShapeTool, {
110 110
111 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; 111 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
112 canvas.elementModel.shapeModel.fillMaterial = fillMaterial; 112 canvas.elementModel.shapeModel.fillMaterial = fillMaterial;
113 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
114 canvas.elementModel.shapeModel.fillMaterialIndex = fillIndex;
115 113
116 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex; 114 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
117 canvas.elementModel.shapeModel.strokeStyle = strokeStyle; 115 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
118 116
119 canvas.elementModel.shapeModel.GLGeomObj = rect; 117 canvas.elementModel.shapeModel.GLGeomObj = rect;
118 canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
120 } 119 }
121 else 120 else
122 { 121 {
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 9a4399b4..4ccb7a8d 100644
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -83,6 +83,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
83 } 83 }
84 } 84 }
85 this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, canvas); 85 this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, canvas);
86 NJevent("elementAdded", canvas);
86 } 87 }
87 88
88 this.endDraw(event); 89 this.endDraw(event);
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index c527edf3..e3f49bbe 100644
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -158,19 +158,17 @@ exports.TagTool = Montage.create(DrawingTool, {
158 selectedTag = this.options.selectedElement; 158 selectedTag = this.options.selectedElement;
159 159
160 if(selectedTag === "divTool") { 160 if(selectedTag === "divTool") {
161 newTag = NJUtils.makeNJElement("div", "Div", "block"); 161 newTag = NJUtils.makeNJElement("div", "div", "block");
162 } else if(selectedTag === "imageTool") { 162 } else if(selectedTag === "imageTool") {
163 newTag = NJUtils.makeNJElement("image", "Image", "image"); 163 newTag = NJUtils.makeNJElement("image", "image", "image");
164 } else if(selectedTag === "videoTool") { 164 } else if(selectedTag === "videoTool") {
165 newTag = NJUtils.makeNJElement("video", "Video", "video", { 165 newTag = NJUtils.makeNJElement("video", "video", "video", {
166 innerHTML: "Your browser does not support the VIDEO element." 166 innerHTML: "Your browser does not support the VIDEO element."
167 }); 167 });
168 } else if(selectedTag === "canvasTool") { 168 } else if(selectedTag === "canvasTool") {
169 newTag = NJUtils.makeNJElement("canvas", "Canvas", "canvas"); 169 newTag = NJUtils.makeNJElement("canvas", "canvas", "canvas");
170 } else if(selectedTag === "customTool") { 170 } else if(selectedTag === "customTool") {
171 newTag = document.createElement(this.options.customName.value); 171 newTag = NJUtils.makeNJElement(this.options.customName.value, this.options.customName.value, "block");
172 newTag.Ninja = {};
173 newTag.Ninja.selectionType = this.options.customName.value;
174 } 172 }
175 /* SWF Tag tool - Not used for now. Will revisit this at a later time. 173 /* SWF Tag tool - Not used for now. Will revisit this at a later time.
176 else if(selectedTag === "flashTool") { 174 else if(selectedTag === "flashTool") {