aboutsummaryrefslogtreecommitdiff
path: root/js/tools/FillTool.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-07 07:21:27 -0800
committerPushkar Joshi2012-02-07 07:21:27 -0800
commit4bbe42e6d01fd0f81d13357a75b40eae9925dda3 (patch)
tree57f49ebfa5d3fcef28753b34015209edda6e620a /js/tools/FillTool.js
parente7aa17a9b472640355e95c54841399f6203050d4 (diff)
parent8950b342d1eda8bfa195372e1c17363a409651cd (diff)
downloadninja-4bbe42e6d01fd0f81d13357a75b40eae9925dda3.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/tools/FillTool.js')
-rw-r--r--js/tools/FillTool.js20
1 files changed, 17 insertions, 3 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 }