CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-25 06:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for pointerId and simplify position calculations in doubleUp (re: #7611)

Browse Source
This commit is contained in:
Quincy Morgan
2020-05-18 09:58:15 -04:00
parent b62fe3d87d
commit a5091c3bd0
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/renderer/map.js
View File

@@ -919,7 +919,7 @@ export function rendererMap(context) {
map.transformEase = function(t2, duration) {
duration = duration || 250;
setTransform(t2, duration, false);
setTransform(t2, duration, false /* don't force */);
return map;
};

18
modules/util/double_up.js
View File

@@ -27,19 +27,24 @@ export function utilDoubleUp() {
// ignore right-click
if (d3_event.ctrlKey || d3_event.button === 2) return;
var loc = utilFastMouse(this)(d3_event);
var loc = [d3_event.clientX, d3_event.clientY];
// Don't rely on pointerId here since it can change between pointerdown
// events on touch devices
if (_pointer && !pointerIsValidFor(loc)) {
// if this pointer is no longer valid, clear it so another can be started
_pointer = undefined;
}
if (!_pointer) {
// don't rely on the pointerId since it can change between down events on touch devices
_pointer = {
startLoc: loc,
startTime: new Date().getTime(),
upCount: 0
upCount: 0,
pointerId: d3_event.pointerId
};
} else { // double down
_pointer.pointerId = d3_event.pointerId;
}
}
@@ -48,14 +53,15 @@ export function utilDoubleUp() {
// ignore right-click
if (d3_event.ctrlKey || d3_event.button === 2) return;
if (!_pointer) return;
if (!_pointer || _pointer.pointerId !== d3_event.pointerId) return;
_pointer.upCount += 1;
if (_pointer.upCount === 2) { // double up!
var loc = utilFastMouse(this)(d3_event);
var loc = [d3_event.clientX, d3_event.clientY];
if (pointerIsValidFor(loc)) {
dispatch.call('doubleUp', this, loc);
var locInThis = utilFastMouse(this)(d3_event);
dispatch.call('doubleUp', this, locInThis);
}
// clear the pointer info in any case
_pointer = undefined;