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

Fix semicombo drag-and-drop issues with stale data and target positioning (re: #7024)

Browse Source
This commit is contained in:
Quincy Morgan
2020-01-10 13:59:50 -05:00
parent a60c182078
commit 40b6fe7ff9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/ui/fields/combo.js
View File

@@ -442,14 +442,15 @@ export function uiFieldCombo(field, context) {
.attr('class', 'chip')
.classed('draggable', isSemi);
if (isSemi) { // only semiCombo values are ordered
registerDragAndDrop(enter);
}
enter.append('span');
enter.append('a');
chips = chips.merge(enter);
chips = chips.merge(enter)
.order();
if (isSemi) { // only semiCombo values are ordered
registerDragAndDrop(chips);
}
chips.select('span')
.text(function(d) { return d.value; });
@@ -521,8 +522,8 @@ export function uiFieldCombo(field, context) {
// check the cursor is in the bounding box
if (
index !== index2 &&
d3_event.x < node.offsetLeft + (node.offsetWidth / 2) &&
d3_event.x > node.offsetLeft - (node.offsetWidth / 2) &&
d3_event.x < node.offsetLeft + node.offsetWidth + 5 &&
d3_event.x > node.offsetLeft &&
d3_event.y < node.offsetTop + node.offsetHeight &&
d3_event.y > node.offsetTop
) {