diff options
author | Valerio Virgillito | 2012-02-06 11:02:14 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-06 11:02:14 -0800 |
commit | 671a27069db6a121507c2b342653aede685cff67 (patch) | |
tree | 77e9f1499c400229273f880c9d365115b411b227 /js/tools/FillTool.js | |
parent | e58204970e398ce3a36a52bbf72d120c7ffdc167 (diff) | |
parent | 1b0c5c0e7ebf9dda95a624da546aaece268631ad (diff) | |
download | ninja-671a27069db6a121507c2b342653aede685cff67.tar.gz |
Merge pull request #15 from mqg734/ToolFixes
Adding, deleting and modifying elements now keep the element planes and PI in sync.
Diffstat (limited to 'js/tools/FillTool.js')
-rw-r--r-- | js/tools/FillTool.js | 20 |
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 | } |