diff options
author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/tools/FillTool.js | |
parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'js/tools/FillTool.js')
-rwxr-xr-x | js/tools/FillTool.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js index 46d76a19..4b07ae83 100755 --- a/js/tools/FillTool.js +++ b/js/tools/FillTool.js | |||
@@ -22,14 +22,14 @@ exports.FillTool = Montage.create(ModifierToolBase, { | |||
22 | value : function (event) | 22 | value : function (event) |
23 | { | 23 | { |
24 | var obj = this.application.ninja.stage.GetElement(event); | 24 | var obj = this.application.ninja.stage.GetElement(event); |
25 | var cursor = "url('images/cursors/fill.png') 17 12, default"; | 25 | var cursor = "url('images/cursors/fill.png') 14 14, default"; |
26 | var canColor = true; | 26 | var canColor = true; |
27 | if (obj) | 27 | if (obj) |
28 | { | 28 | { |
29 | var name = obj.nodeName; | 29 | var name = obj.nodeName; |
30 | if ((name !== 'CANVAS') && (name !== 'DIV')) | 30 | if ((name !== 'CANVAS') && (name !== 'DIV')) |
31 | { | 31 | { |
32 | cursor = "url('images/cursors/nofill.png') 17 12, default"; | 32 | cursor = "url('images/cursors/nofill.png') 14 14, default"; |
33 | canColor = false; | 33 | canColor = false; |
34 | } | 34 | } |
35 | } | 35 | } |