Better detect code that requires a tool object.

Closes paperjs#967
bmacnaughton · Feb 14, 2016 · dbd7a90 · dbd7a90
1 parent 27197bd
commit dbd7a90
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/core/PaperScript.js b/src/core/PaperScript.js
@@ -386,11 +386,10 @@ Base.exports.PaperScript = (function() {
         // Set currently active scope.
         paper = scope;
         var view = scope.getView(),
-            // Only create a tool object if something resembling a tool handler
-            // definition is contained in the code.
-            tool = /\s+on(?:Key|Mouse)(?:Up|Down|Move|Drag)\b/.test(code)
-                    ? new Tool()
-                    : null,
+            // Only create a tool if the tool object is accessed or something
+            // resembling a global tool handler is contained in the code.
+            tool = /\btool\.\w+|\s+on(?:Key|Mouse)(?:Up|Down|Move|Drag)\b/
+                    .test(code) ? new Tool() : null,
             toolHandlers = tool ? tool._events : [],
             // Compile a list of all handlers that can be defined globally
             // inside the PaperScript. These are passed on to the function as