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

Register tiny drag as click on ribbon preset mode buttons (re: #6040)

Browse Source
This commit is contained in:
Quincy Morgan
2019-03-12 11:42:58 -04:00
parent 83aec58091
commit 3dddb82379
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/modes.js
+8 -4
View File
@@ -185,8 +185,7 @@ export function uiModes(context) {
.on('click.mode-buttons', function(d) {
// When drawing, ignore accidental clicks on mode buttons - #4042
var currMode = context.mode().id;
if (/^draw/.test(currMode)) return;
if (/^draw/.test(context.mode().id)) return;
toggleMode(d);
})
@@ -211,7 +210,7 @@ export function uiModes(context) {
}
});
var dragOrigin, targetIndex, targetData;
var dragOrigin, dragMoved, targetIndex, targetData;
buttonsEnter.call(d3_drag()
.on('start', function() {
@@ -221,8 +220,10 @@ export function uiModes(context) {
};
targetIndex = null;
targetData = null;
dragMoved = false;
})
.on('drag', function(d, index) {
dragMoved = true;
var x = d3_event.x - dragOrigin.x,
y = d3_event.y - dragOrigin.y;
@@ -272,7 +273,10 @@ export function uiModes(context) {
})
.on('end', function(d, index) {
if (!d3_select(this).classed('dragging')) return;
if (dragMoved && !d3_select(this).classed('dragging')) {
toggleMode(d);
return;
}
d3_select(this)
.classed('dragging', false)