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

Remove try/catch clauses and add missing check for existance of onMouseUp

Browse source
This commit is contained in:
Jonathan Puckey 2011-02-09 01:07:29 +01:00
parent 0cefc146bb
commit 440db1c1e3
1 changed files with 48 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
src/ToolHandler.js
View file

@ -101,74 +101,55 @@ ToolHandler = Base.extend({
}, },
onHandleEvent: function(type, pt, modifiers) { onHandleEvent: function(type, pt, modifiers) {
try { switch (type) {
switch (type) { case 'MOUSE_DOWN':
case 'MOUSE_DOWN': this.updateEvent(type, pt, null, null, true, false, false);
this.updateEvent(type, pt, null, null, true, false, false); if(this.onMouseDown)
if(this.onMouseDown) this.onMouseDown(new ToolEvent(this, type, modifiers));
this.onMouseDown(new ToolEvent(this, type, modifiers)); break;
break; case 'MOUSE_DRAG':
case 'MOUSE_DRAG': // In order for idleInterval drag events to work, we need to
// In order for idleInterval drag events to work, we need to // not check the first call for a change of position.
// not check the first call for a change of position. // Subsequent calls required by min/maxDistance functionality
// Subsequent calls required by min/maxDistance functionality // will require it, otherwise this might loop endlessly.
// will require it, otherwise this might loop endlessly. this.needsChange = false;
this.needsChange = false; // If the mouse is moving faster than maxDistance, do not
// If the mouse is moving faster than maxDistance, do not // produce events for what is left after the first event is
// produce events for what is left after the first event is // generated in case it is shorter than maxDistance, as this
// generated in case it is shorter than maxDistance, as this // would produce weird results. matchMaxDistance controls this.
// would produce weird results. matchMaxDistance controls this. this.matchMaxDistance = false;
this.matchMaxDistance = false; while (this.updateEvent(type, pt, this.minDistance,
while (this.updateEvent(type, pt, this.minDistance, this.maxDistance, false, this.needsChange, this.matchMaxDistance)) {
this.maxDistance, false, this.needsChange, this.matchMaxDistance)) { if(this.onMouseDrag)
try { this.onMouseDrag(new ToolEvent(this, type, modifiers));
if(this.onMouseDrag) this.needsChange = true;
this.onMouseDrag(new ToolEvent(this, type, modifiers)); this.matchMaxDistance = true;
} catch (e) {
// ScriptographerEngine.reportError(e);
}
this.needsChange = true;
this.matchMaxDistance = true;
}
break;
case 'MOUSE_UP':
// If the last mouse drag happened in a different place, call
// mouse drag first, then mouse up.
if ((this.point.x != pt.x || this.point.y != pt.y) && this.updateEvent(
'MOUSE_DRAG', pt, this.minDistance, this.maxDistance, false, false, false)) {
try {
if(this.onMouseDrag)
this.onMouseDrag(new ToolEvent(this, type, modifiers));
} catch (e) {
// ScriptographerEngine.reportError(e);
}
}
this.updateEvent(type, pt, null, this.maxDistance, false,
false, false);
try {
this.onMouseUp(new ToolEvent(this, type, modifiers));
} catch (e) {
// ScriptographerEngine.reportError(e);
}
// Start with new values for TRACK_CURSOR
this.updateEvent(type, pt, null, null, true, false, false);
this.firstMove = true;
break;
case 'MOUSE_MOVE':
while (this.updateEvent(type, pt, this.minDistance,
this.maxDistance, this.firstMove, true, false)) {
try {
if(this.onMouseMove)
this.onMouseMove(new ToolEvent(this, type, modifiers));
} catch (e) {
// ScriptographerEngine.reportError(e);
}
this.firstMove = false;
}
break;
} }
} catch (e) { break;
//ScriptographerEngine.reportError(e); case 'MOUSE_UP':
// If the last mouse drag happened in a different place, call
// mouse drag first, then mouse up.
if ((this.point.x != pt.x || this.point.y != pt.y) && this.updateEvent(
'MOUSE_DRAG', pt, this.minDistance, this.maxDistance, false, false, false)) {
if(this.onMouseDrag)
this.onMouseDrag(new ToolEvent(this, type, modifiers));
}
this.updateEvent(type, pt, null, this.maxDistance, false,
false, false);
if(this.onMouseUp)
this.onMouseUp(new ToolEvent(this, type, modifiers));
// Start with new values for TRACK_CURSOR
this.updateEvent(type, pt, null, null, true, false, false);
this.firstMove = true;
break;
case 'MOUSE_MOVE':
while (this.updateEvent(type, pt, this.minDistance,
this.maxDistance, this.firstMove, true, false)) {
if(this.onMouseMove)
this.onMouseMove(new ToolEvent(this, type, modifiers));
this.firstMove = false;
}
break;
} }
} }
}); });