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

Make sure we really don't call preventDefault() if there's only a mousemove handler.

Browse source
This commit is contained in:
Jürg Lehni 2016-01-14 12:42:33 +01:00
parent 5f44d814f5
commit e2723f0312
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/view/View.js
View file

@ -968,7 +968,8 @@ new function() { // Injection scope for mouse events on the browser
_handleEvent: function(type, event, point) {
var handleItems = this._itemEvents[type],
project = paper.project,
tool = this._scope.tool;
tool = this._scope.tool,
view = this;
// If it's a native mousemove event but the mouse is down, convert
// it to a mousedrag.
// NOTE: emitEvent(), as well as Tool#_handleEvent() fall back to
@ -1067,16 +1068,23 @@ new function() { // Injection scope for mouse events on the browser
// them enforces default, to prevent scrolling on touch devices.
if (handle && tool)
called = tool._handleEvent(type, event, point, mouse) || called;
// Call preventDefault()`, but only according to this convention:
// Now call preventDefault()`, if any of these conditions are met:
// - If any of the handlers were called, except for mousemove events
// which need to call `event.preventDefault()` explicitly, or
// `return false;`.
// - If this is a mousedown event, and the view or tools respond to
// mouseup.
var up = 'mouseup';
if (called && !mouse.move || mouse.down && (this._itemEvents[up]
|| this.responds(up) || tool.responds(up)))
function responds(type) {
return view._itemEvents[type] || view.responds(type)
|| tool.responds(type);
}
if (called && (!nativeMove || responds('mousedrag'))
|| mouse.down && responds('mouseup'))
event.preventDefault();
// In the end we always call update(), which only updates the view
// if anything has changed in the above calls.
this.update();