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

Fix error when deleting a triangle vertex

Browse Source 
Fixes #1712
This commit is contained in:
John Firebaugh
2013-08-21 15:25:51 -07:00
parent e631faa185
commit ccf2491bdd
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/id/operations/delete.js
View File

@@ -3,11 +3,11 @@ iD.operations.Delete = function(selectedIDs, context) {
var operation = function() {
var annotation,
mode;
nextSelectedID;
if (selectedIDs.length > 1) {
annotation = t('operations.delete.annotation.multiple', {n: selectedIDs.length});
mode = iD.modes.Browse(context);
} else {
var id = selectedIDs[0],
entity = context.entity(id),
@@ -16,7 +16,6 @@ iD.operations.Delete = function(selectedIDs, context) {
parent = parents[0];
annotation = t('operations.delete.annotation.' + geometry);
mode = iD.modes.Browse(context);
// Select the next closest node in the way.
if (geometry === 'vertex' && parents.length === 1 && parent.nodes.length > 2) {
@@ -33,7 +32,7 @@ iD.operations.Delete = function(selectedIDs, context) {
i = a < b ? i - 1 : i + 1;
}
mode = iD.modes.Select(context, [nodes[i]]);
nextSelectedID = nodes[i];
}
}
@@ -41,8 +40,11 @@ iD.operations.Delete = function(selectedIDs, context) {
action,
annotation);
context.enter(mode);
if (nextSelectedID && context.hasEntity(nextSelectedID)) {
context.enter(iD.modes.Select(context, [nextSelectedID]));
} else {
context.enter(iD.modes.Browse(context));
}
};
operation.available = function() {