CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace mouse and touch events with pointer events in popover.js (re: #5505)

Browse Source
This commit is contained in:
Quincy Morgan
2020-03-13 12:34:06 -07:00
parent 84b65bed9c
commit de1bfe624f
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/util/popover.js
+15 -17
View File
@@ -18,6 +18,9 @@ export function popover(klass) {
var _displayType = utilFunctor('');
var _hasArrow = utilFunctor(true);
// use pointer events on supported platforms; fallback to mouse events
var _pointerPrefix = 'PointerEvent' in window ? 'pointer' : 'mouse';
popover.displayType = function(val) {
if (arguments.length) {
_displayType = utilFunctor(val);
@@ -98,10 +101,10 @@ export function popover(klass) {
selector = selector || '.popover-' + _id;
selection
.on('mouseenter.popover', null)
.on('mouseleave.popover', null)
.on('mouseup.popover', null)
.on('mousedown.popover', null)
.on(_pointerPrefix + 'enter.popover', null)
.on(_pointerPrefix + 'leave.popover', null)
.on(_pointerPrefix + 'up.popover', null)
.on(_pointerPrefix + 'down.popover', null)
.on('click.popover', null)
.attr('title', function() {
return this.getAttribute('data-original-title') || this.getAttribute('title');
@@ -116,8 +119,6 @@ export function popover(klass) {
selection.call(popover.destroy, '.popover');
};
var isTouchEvent = false;
function setup() {
var anchor = d3_select(this);
var animate = _animation.apply(this, arguments);
@@ -151,20 +152,16 @@ export function popover(klass) {
var display = _displayType.apply(this, arguments);
if (display === 'hover') {
anchor.on('touchstart.popover', function() {
// hack to avoid showing popovers upon touch input
isTouchEvent = true;
});
anchor.on('mouseenter.popover', show);
anchor.on('mouseleave.popover', hide);
anchor.on(_pointerPrefix + 'enter.popover', show);
anchor.on(_pointerPrefix + 'leave.popover', hide);
} else if (display === 'clickFocus') {
anchor
.on('mousedown.popover', function() {
.on(_pointerPrefix + 'down.popover', function() {
d3_event.preventDefault();
d3_event.stopPropagation();
})
.on('mouseup.popover', function() {
.on(_pointerPrefix + 'up.popover', function() {
d3_event.preventDefault();
d3_event.stopPropagation();
})
@@ -182,8 +179,9 @@ export function popover(klass) {
function show() {
if (isTouchEvent) {
isTouchEvent = false;
var displayType = _displayType.apply(this, arguments);
if (displayType === 'hover' && d3_event.pointerType === 'touch') {
// don't show hover popovers on touch devices
return;
}
var anchor = d3_select(this);
@@ -197,7 +195,7 @@ export function popover(klass) {
popoverSelection.classed('in', true);
if (_displayType.apply(this, arguments) === 'clickFocus') {
if (displayType === 'clickFocus') {
anchor.classed('active', true);
popoverSelection.node().focus();
}