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

Remove MouseEvent#target hitTest() getter magic again.

Browse source 
Relates to #995
This commit is contained in:
Jürg Lehni 2016-06-17 00:42:40 +02:00
parent 74b22266f7
commit a03631f620
2 changed files with 15 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/event/MouseEvent.js
View file

@ -30,7 +30,7 @@ var MouseEvent = Event.extend(/** @lends MouseEvent# */{
this.type = type;
this.event = event;
this.point = point;
this._target = target;
this.target = target;
this.delta = delta;
},
@ -51,20 +51,6 @@ var MouseEvent = Event.extend(/** @lends MouseEvent# */{
* @type Point
*/
// DOCS: document MouseEvent#target
/**
* @name MouseEvent#target
* @type Item
*/
getTarget: function() {
// #_target may be a hitTest() function, in which case we need to
// execute and override it the first time #target is requested.
var target = this._target;
if (typeof target === 'function')
target = this._target = target();
return target;
},
// DOCS: document MouseEvent#delta
/**
* @name MouseEvent#delta
@ -77,7 +63,7 @@ var MouseEvent = Event.extend(/** @lends MouseEvent# */{
toString: function() {
return "{ type: '" + this.type
+ "', point: " + this.point
+ ', target: ' + this.getTarget()
+ ', target: ' + this.target
+ (this.delta ? ', delta: ' + this.delta : '')
+ ', modifiers: ' + this.getModifiers()
+ ' }';

49
src/view/View.js
View file

@ -1196,8 +1196,7 @@ new function() { // Injection scope for event handling on the browser
}
// Returns true if event was stopped, false otherwise.
function emitMouseEvents(view, hitItem, hitTest, type, event, point,
prevPoint) {
function emitMouseEvents(view, hitItem, type, event, point, prevPoint) {
// Before handling events, process removeOn() calls for cleanup.
// NOTE: As soon as there is one event handler receiving mousedrag
// events, non of the removeOnMove() items will be removed while the
@ -1219,9 +1218,7 @@ new function() { // Injection scope for event handling on the browser
&& emitMouseEvent(hitItem, null, fallbacks[type] || type, event,
point, prevPoint, dragItem)
// Lastly handle the mouse events on the view, if we're still here.
// Choose from the potential targets in the right sequence, with the
// hitTest() function as the fall-back getter for MouseEvent#target.
|| emitMouseEvent(view, dragItem || hitItem || hitTest, type, event,
|| emitMouseEvent(view, dragItem || hitItem || view, type, event,
point, prevPoint));
}
@ -1299,7 +1296,12 @@ new function() { // Injection scope for event handling on the browser
// Run the hit-test on items first, but only if we're required to do
// so for this given mouse event, see hitItems, #_countItemEvent():
var inView = this.getBounds().contains(point),
hitItem,
hit = inView && view._project.hitTest(point, {
tolerance: 0,
fill: true,
stroke: true
});
hitItem = hit && hit.item || null,
// Keep track if view event should be handled, so we can use it
// to decide if tool._handleMouseEvent() shall be called after.
handle = false,
@ -1308,28 +1310,6 @@ new function() { // Injection scope for event handling on the browser
// mouse event types.
mouse[type.substr(5)] = true;
// Provide a hit-test function that makes sure to only perform the
// hit-test once, and only when it's actually required. This method
// is passed to emitMouseEvents() and as target to emitMouseEvent(),
// as the fall-back getter for MouseEvent#target.
function hitTest() {
//
if (hitItem === undefined) {
var hit = inView && view._project.hitTest(point, {
tolerance: 0,
fill: true,
stroke: true
});
hitItem = hit && hit.item || null;
}
// Return the target with view as the fall-back, as expected by
// MouseEvent#target.
return hitItem || view;
}
// Execute hitTest right away if we have events relying on hitItem.
if (hitItems)
hitTest();
// Handle mouseenter / leave between items and views first.
if (hitItems && hitItem !== overItem) {
if (overItem) {
@ -1355,9 +1335,8 @@ new function() { // Injection scope for event handling on the browser
if ((inView || mouse.drag) && !point.equals(lastPoint)) {
// Handle mousemove even if this is not actually a mousemove
// event but the mouse has moved since the last event.
emitMouseEvents(this, hitItem, hitTest,
nativeMove ? type : 'mousemove', event,
point, lastPoint);
emitMouseEvents(this, hitItem, nativeMove ? type : 'mousemove',
event, point, lastPoint);
handle = true;
}
wasInView = inView;
@ -1365,8 +1344,7 @@ new function() { // Injection scope for event handling on the browser
// We emit mousedown only when in the view, and mouseup regardless,
// as long as the mousedown event was inside.
if (mouse.down && inView || mouse.up && downPoint) {
emitMouseEvents(this, hitItem, hitTest, type, event,
point, downPoint);
emitMouseEvents(this, hitItem, type, event, point, downPoint);
if (mouse.down) {
// See if we're clicking again on the same item, within the
// double-click time. Firefox uses 300ms as the max time
@ -1383,9 +1361,8 @@ new function() { // Injection scope for event handling on the browser
// not the view.
if (!prevented && hitItem === downItem) {
clickTime = Date.now();
emitMouseEvents(this, hitItem, hitTest,
dblClick ? 'doubleclick' : 'click', event,
point, downPoint);
emitMouseEvents(this, hitItem, dblClick ? 'doubleclick'
: 'click', event, point, downPoint);
dblClick = false;
}
downItem = dragItem = null;