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

Make mouseout use container coordinates (closes #2758)

Browse Source
This commit is contained in:
Bryan Housel
2015-09-28 11:09:39 -04:00
parent b96afcf132
commit fda733de28
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
js/id/behavior/draw.js
View File

@@ -1,6 +1,6 @@
iD.behavior.Draw = function(context) {
var event = d3.dispatch('move', 'click', 'clickWay',
'clickNode', 'undo', 'cancel', 'finish'),
'clickNode', 'undo', 'cancel', 'finish'),
keybinding = d3.keybinding('draw'),
hover = iD.behavior.Hover(context)
.altDisables(true)
@@ -18,7 +18,7 @@ iD.behavior.Draw = function(context) {
function mousedown() {
function point() {
var p = element.node().parentNode;
var p = context.container().node();
return touchId !== null ? d3.touches(p).filter(function(p) {
return p.identifier === touchId;
})[0] : d3.mouse(p);
@@ -26,17 +26,20 @@ iD.behavior.Draw = function(context) {
var element = d3.select(this),
touchId = d3.event.touches ? d3.event.changedTouches[0].identifier : null,
time = +new Date(),
pos = point();
t1 = +new Date(),
p1 = point();
element.on('mousemove.draw', null);
d3.select(window).on('mouseup.draw', function() {
element.on('mousemove.draw', mousemove);
if (iD.geo.euclideanDistance(pos, point()) < closeTolerance ||
(iD.geo.euclideanDistance(pos, point()) < tolerance &&
(+new Date() - time) < 500)) {
var t2 = +new Date(),
p2 = point(),
dist = iD.geo.euclideanDistance(p1, p2);
element.on('mousemove.draw', mousemove);
d3.select(window).on('mouseup.draw', null);
if (dist < closeTolerance || (dist < tolerance && (t2 - t1) < 500)) {
// Prevent a quick second click
d3.select(window).on('click.draw-block', function() {
d3.event.stopPropagation();