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

Fix prior commit and add additional safety checks

Browse Source
This commit is contained in:
Quincy Morgan
2020-05-28 14:12:11 -04:00
parent 1214b2d5dd
commit 717f9ae5b7
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/behavior/draw.js
+19 -4
View File
@@ -72,7 +72,7 @@ export function behaviorDraw(context) {
downLoc: pointerLocGetter(d3_event)
};
dispatch.call('pointerdown', this, datum());
dispatch.call('down', this, datum());
}
function pointerup() {
@@ -108,7 +108,9 @@ export function behaviorDraw(context) {
}
function pointermove() {
if (_downPointer && !_downPointer.isCancelled) {
if (_downPointer &&
_downPointer.id === (d3_event.pointerId || 'mouse') &&
!_downPointer.isCancelled) {
var p2 = _downPointer.pointerLocGetter(d3_event);
var dist = geoVecLength(_downPointer.downLoc, p2);
if (dist >= _closeTolerance) {
@@ -131,6 +133,17 @@ export function behaviorDraw(context) {
dispatch.call('move', this, datum());
}
function pointercancel() {
if (_downPointer &&
_downPointer.id === (d3_event.pointerId || 'mouse')) {
if (!_downPointer.isCancelled) {
dispatch.call('downcancel', this);
}
_downPointer = null;
}
}
function mouseenter() {
_mouseLeave = false;
}
@@ -246,7 +259,8 @@ export function behaviorDraw(context) {
.on(_pointerPrefix + 'move.draw', pointermove);
d3_select(window)
.on(_pointerPrefix + 'up.draw', pointerup, true);
.on(_pointerPrefix + 'up.draw', pointerup, true)
.on('pointercancel.draw', pointercancel, true);
d3_select(document)
.call(keybinding);
@@ -267,7 +281,8 @@ export function behaviorDraw(context) {
.on(_pointerPrefix + 'move.draw', null);
d3_select(window)
.on(_pointerPrefix + 'up.draw', null);
.on(_pointerPrefix + 'up.draw', null)
.on('pointercancel.draw', null);
// note: keyup.space-block, click.draw-block should remain
d3_select(document)