aboutsummaryrefslogtreecommitdiff
path: root/js/tools/InkBottleTool.js
diff options
context:
space:
mode:
authorJonathan Duran2012-02-27 11:22:51 -0800
committerJonathan Duran2012-02-27 11:22:51 -0800
commitab10898c78f2bd5d765d9c915848ed8c8e08c5a3 (patch)
treeb1ebb87e9c101c558108e1cec043d64a03cc50a1 /js/tools/InkBottleTool.js
parentfb8aacbadba8dffb9619eb16e4626c197dc9264d (diff)
parentda60be29baab67440535b6b2b71fe7de989dfed0 (diff)
downloadninja-ab10898c78f2bd5d765d9c915848ed8c8e08c5a3.tar.gz
Merge branch 'refs/heads/integration-candidate' into Timeline
Diffstat (limited to 'js/tools/InkBottleTool.js')
-rwxr-xr-xjs/tools/InkBottleTool.js4
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 }