scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-06 04:42:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only include the global handlers in the return statement that actually seem to be defined.

Browse source
This commit is contained in:
Jürg Lehni 2014-01-04 22:10:16 +01:00
parent 4302682c1c
commit 227d511fc0
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/PaperScript.js
View file

@ -239,7 +239,7 @@ var PaperScript = Base.exports.PaperScript = (function() {
var view = scope.getView(), var view = scope.getView(),
// Only create a tool object if something resembling a tool handler // Only create a tool object if something resembling a tool handler
// definition is contained in the code. // definition is contained in the code.
tool = /\s+on(?:Key|Mouse)(?:Up|Down|Move|Drag)/.test(code) tool = /\s+on(?:Key|Mouse)(?:Up|Down|Move|Drag)\b/.test(code)
? new Tool() ? new Tool()
: null, : null,
toolHandlers = tool ? tool._events : [], toolHandlers = tool ? tool._events : [],
@ -270,11 +270,16 @@ var PaperScript = Base.exports.PaperScript = (function() {
// end of the code execution, so we can retrieve their values from the // end of the code execution, so we can retrieve their values from the
// function call. // function call.
handlers = Base.each(handlers, function(key) { handlers = Base.each(handlers, function(key) {
params.push(key); // Check for each handler explicitely and only return them if they
this.push(key + ': ' + key); // seem to exist.
if (new RegExp('\\s+' + key + '\\b').test(code)) {
params.push(key);
this.push(key + ': ' + key);
}
}, []).join(', '); }, []).join(', ');
// We need an additional line that returns the handlers in one object. // We need an additional line that returns the handlers in one object.
code += '\nreturn { ' + handlers + ' };'; if (handlers)
code += '\nreturn { ' + handlers + ' };';
/*#*/ if (__options.environment == 'browser') { /*#*/ if (__options.environment == 'browser') {
if (window.InstallTrigger || window.chrome) { // Firefox and Chrome if (window.InstallTrigger || window.chrome) { // Firefox and Chrome
// On Firefox, all error numbers inside dynamically compiled code // On Firefox, all error numbers inside dynamically compiled code
@ -301,7 +306,7 @@ var PaperScript = Base.exports.PaperScript = (function() {
/*#*/ } else { // !__options.environment == 'browser' /*#*/ } else { // !__options.environment == 'browser'
func = Function(params, code); func = Function(params, code);
/*#*/ } // !__options.environment == 'browser' /*#*/ } // !__options.environment == 'browser'
var res = func.apply(scope, args); var res = func.apply(scope, args) || {};
// Now install the 'global' tool and view handlers, and we're done! // Now install the 'global' tool and view handlers, and we're done!
Base.each(toolHandlers, function(key) { Base.each(toolHandlers, function(key) {
var value = res[key]; var value = res[key];