diff options
author | Jon Reid | 2012-02-27 12:08:17 -0800 |
---|---|---|
committer | Jon Reid | 2012-02-27 12:08:17 -0800 |
commit | d55224f36da55e26c266a02efa6e58d4ecf1253e (patch) | |
tree | 36faa8ff93c0f7b925f5c0a7fb85b5d209da1f8e /js/tools/InkBottleTool.js | |
parent | ec5f81c6c0ccf865505ab82ebf9240c667f05c91 (diff) | |
parent | cf9e9b711ba3d77a2a0888f8ab763383f53a1619 (diff) | |
download | ninja-d55224f36da55e26c266a02efa6e58d4ecf1253e.tar.gz |
Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local
Diffstat (limited to 'js/tools/InkBottleTool.js')
-rwxr-xr-x | js/tools/InkBottleTool.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js index 2be74ada..8340ef50 100755 --- a/js/tools/InkBottleTool.js +++ b/js/tools/InkBottleTool.js | |||
@@ -16,14 +16,14 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, { | |||
16 | value : function (event) | 16 | value : function (event) |
17 | { | 17 | { |
18 | var obj = this.application.ninja.stage.GetElement(event); | 18 | var obj = this.application.ninja.stage.GetElement(event); |
19 | var cursor = "url('images/cursors/ink.png') 17 12, default"; | 19 | var cursor = "url('images/cursors/ink.png') 6 11, default"; |
20 | var canColor = true; | 20 | var canColor = true; |
21 | if (obj) | 21 | if (obj) |
22 | { | 22 | { |
23 | var name = obj.nodeName; | 23 | var name = obj.nodeName; |
24 | if ((name !== 'CANVAS') && (name !== 'DIV')) | 24 | if ((name !== 'CANVAS') && (name !== 'DIV')) |
25 | { | 25 | { |
26 | cursor = "url('images/cursors/ink_no.png') 17 12, default"; | 26 | cursor = "url('images/cursors/ink_no.png') 6 11, default"; |
27 | canColor = false; | 27 | canColor = false; |
28 | } | 28 | } |
29 | } | 29 | } |