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

Use fastMouse

Browse Source
This commit is contained in:
John Firebaugh
2013-05-04 11:31:46 -07:00
parent 0d7422acfa
commit bb487ba0ee
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/id/modes/select.js
View File

@@ -31,7 +31,7 @@ iD.modes.Select = function(context, selection) {
if (entity && entity.type === 'node') {
radialMenu.center(context.projection(entity.loc));
} else {
radialMenu.center(d3.mouse(context.surface().node()));
radialMenu.center(context.map().mousePosition());
}
}

17
js/id/renderer/map.js
View File

@@ -25,7 +25,8 @@ iD.Map = function(context) {
midpoints = iD.svg.Midpoints(roundedProjection, context),
labels = iD.svg.Labels(roundedProjection, context),
tail = iD.ui.Tail(),
supersurface, surface;
supersurface, surface,
mouse;
function map(selection) {
context.history()
@@ -79,6 +80,7 @@ iD.Map = function(context) {
map.surface = surface;
labels.supersurface(supersurface);
mouse = iD.util.fastMouse(supersurface.node());
supersurface
.call(tail);
@@ -244,13 +246,14 @@ iD.Map = function(context) {
return [l[0] * scale + translate[0], l[1] * scale + translate[1]];
}
map.mousePosition = function() {
var e = d3.event, s;
while (s = e.sourceEvent) e = s;
return mouse(e);
};
map.mouseCoordinates = function() {
try {
return projection.invert(d3.mouse(surface.node()));
} catch(e) {
// when called with hidden elements, d3.mouse() will throw
return [NaN, NaN];
}
return projection.invert(map.mousePosition());
};
map.dblclickEnable = function(_) {