aboutsummaryrefslogtreecommitdiff
path: root/js/tools/FillTool.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-10 15:10:58 -0700
committerJohn Mayhew2012-05-10 15:10:58 -0700
commitba64dfa1d64969e290f15459a826171468fe3550 (patch)
tree10b26bbfde954d4069b58e866d1105047a2ec72e /js/tools/FillTool.js
parentd32cf39a8ef1e2d2fb50f1183c5546fdac83b396 (diff)
downloadninja-ba64dfa1d64969e290f15459a826171468fe3550.tar.gz
put color chips in the inkbottle and fill tool
Diffstat (limited to 'js/tools/FillTool.js')
-rwxr-xr-xjs/tools/FillTool.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 87a093ff..66dd9305 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -72,9 +72,9 @@ exports.FillTool = Montage.create(ModifierToolBase, {
72 value: function(event) { 72 value: function(event) {
73 this.isDrawing = true; 73 this.isDrawing = true;
74 74
75 if(this._canColor && this.application.ninja.selectedElements.length) 75 if(this._canColor && this.application.ninja.selectedElements.length) {
76 { 76
77 var color = this.application.ninja.colorController.colorToolbar.fill, 77 var color = this.options.fill,
78 colorInfo; 78 colorInfo;
79 if(color && color.color) 79 if(color && color.color)
80 { 80 {
@@ -92,5 +92,4 @@ exports.FillTool = Montage.create(ModifierToolBase, {
92 } 92 }
93 } 93 }
94 } 94 }
95
96}); \ No newline at end of file 95}); \ No newline at end of file