Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reorder and inline pointer/mouse checks
  • Loading branch information
syranide committed Apr 10, 2014
commit d27c24c89a72ac683d27143bf5829e74fe96c37a
29 changes: 11 additions & 18 deletions src/browser/eventPlugins/EnterLeaveEventPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,30 +86,21 @@ var EnterLeaveEventPlugin = {
topLevelTarget,
topLevelTargetID,
nativeEvent) {
var isMouseEvent = (
topLevelType === topLevelTypes.topMouseOut ||
topLevelType === topLevelTypes.topMouseOver
);
var isPointerEvent = (
topLevelType === topLevelTypes.topPointerOut ||
topLevelType === topLevelTypes.topPointerOver
);
if (!isMouseEvent && !isPointerEvent) {
// Must not be a mouse/pointer in or out - ignoring.
return null;
}
var isOverEvent = (
topLevelType === topLevelTypes.topMouseOver ||
topLevelType === topLevelTypes.topPointerOver
);
if (isOverEvent && (nativeEvent.relatedTarget || nativeEvent.fromElement)) {
return null;
}
var isOutEvent = (
topLevelType === topLevelTypes.topMouseOut ||
topLevelType === topLevelTypes.topPointerOut
);

if (!isOverEvent && !isOutEvent) {
// Must not be a mouse/pointer in or out - ignoring.
return null;
}
if (isOverEvent && (nativeEvent.relatedTarget || nativeEvent.fromElement)) {
return null;
}
var win;
if (topLevelTarget.window === topLevelTarget) {
// `topLevelTarget` is probably a window object.
Expand Down Expand Up @@ -148,12 +139,14 @@ var EnterLeaveEventPlugin = {
enterEventType,
eventTypePrefix;

if (isMouseEvent) {
if (topLevelType === topLevelTypes.topMouseOut ||
topLevelType === topLevelTypes.topMouseOver) {
syntheticEventInterface = SyntheticMouseEvent;
leaveEventType = eventTypes.mouseLeave;
enterEventType = eventTypes.mouseEnter;
eventTypePrefix = 'mouse';
} else if (isPointerEvent) {
} else if (topLevelType === topLevelTypes.topPointerOut ||
topLevelType === topLevelTypes.topPointerOver) {
syntheticEventInterface = SyntheticPointerEvent;
leaveEventType = eventTypes.pointerLeave;
enterEventType = eventTypes.pointerEnter;
Expand Down