diff options
author | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
commit | d59cb51c275fbbef84604f9ed77afedba8168099 (patch) | |
tree | 7d3f51c20eb6b6940c1ce648d828fa1e2d8d510b /js/tools/FillTool.js | |
parent | 857aafee732b6a85fa155ff4a05d1b8fde48f09d (diff) | |
parent | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (diff) | |
download | ninja-d59cb51c275fbbef84604f9ed77afedba8168099.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/tools/FillTool.js')
-rwxr-xr-x | js/tools/FillTool.js | 7 |
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 |