aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-13 09:56:40 -0800
committerNivesh Rajbhandari2012-02-13 09:56:40 -0800
commit2edf68e0de786cdc92d5f41548fd61e6c77a57ec (patch)
tree036b7ea15a75dca9abb04b5d44a9b41b066087a6 /js/tools
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-2edf68e0de786cdc92d5f41548fd61e6c77a57ec.tar.gz
Updated ink bottle tool to use new setColor routine in the mediator and controllers.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools')
-rw-r--r--js/tools/FillTool.js3
-rw-r--r--js/tools/InkBottleTool.js35
2 files changed, 25 insertions, 13 deletions
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index fabcec69..46d76a19 100644
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -63,15 +63,14 @@ exports.FillTool = Montage.create(ModifierToolBase, {
63 colorInfo = { mode:color.colorMode, 63 colorInfo = { mode:color.colorMode,
64 color:color.color 64 color:color.color
65 }; 65 };
66 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
67 } 66 }
68 else 67 else
69 { 68 {
70 colorInfo = { mode:"nocolor", 69 colorInfo = { mode:"nocolor",
71 color:color.color 70 color:color.color
72 }; 71 };
73 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
74 } 72 }
73 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
75 } 74 }
76 } 75 }
77 } 76 }
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index cc20d94c..2be74ada 100644
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -48,20 +48,33 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
48 value: function(event) { 48 value: function(event) {
49 this.isDrawing = true; 49 this.isDrawing = true;
50 50
51 if(this._canColor) 51 if(this._canColor && this.application.ninja.selectedElements.length)
52 { 52 {
53// var color = this.application.ninja.colorController.colorToolbar.stroke; 53 var color = this.application.ninja.colorController.colorToolbar.stroke,
54// ElementsMediator.setColor(this.application.ninja.selectedElements, color, false, "Change", "inkBottleTool"); 54 colorInfo;
55 if(color && color.color)
56 {
57 colorInfo = { mode:color.colorMode,
58 color:color.color
59 };
60 }
61 else
62 {
63 colorInfo = { mode:"nocolor",
64 color:color.color
65 };
66 }
67
68 colorInfo.borderInfo = { borderStyle:this.options._borderStyle.value,
69 borderWidth:this.options._borderWidth.value,
70 borderUnits:this.options._borderWidth.units
71 };
55 72
56 var strokeInfo = { borderStyle:this.options._borderStyle.value, 73 colorInfo.strokeInfo = { strokeSize:this.options._strokeSize.value,
57 borderWidth:this.options._borderWidth.value, 74 strokeUnits:this.options._strokeSize.units
58 borderUnits:this.options._borderWidth.units, 75 };
59 strokeSize:this.options._strokeSize.value,
60 strokeUnits:this.options._strokeSize.units,
61 color:this.application.ninja.colorController.colorToolbar.stroke
62 };
63 76
64 ElementsMediator.setStroke(this.application.ninja.selectedElements, strokeInfo, "Change", "inkBottleTool"); 77 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, false, "Change", "inkBottleTool");
65 } 78 }
66 } 79 }
67 } 80 }