Merge branch 'master' into Psigio-3375

This commit is contained in:
Bryan Housel
2016-12-14 11:30:53 -05:00
250 changed files with 19027 additions and 4204 deletions
+6 -3
View File
@@ -26,7 +26,7 @@ export function operationDelete(selectedIDs, context) {
annotation = t('operations.delete.annotation.' + geometry);
// Select the next closest node in the way.
if (geometry === 'vertex' && parents.length === 1 && parent.nodes.length > 2) {
if (geometry === 'vertex' && parent.nodes.length > 2) {
var nodes = parent.nodes,
i = nodes.indexOf(id);
@@ -44,13 +44,16 @@ export function operationDelete(selectedIDs, context) {
}
}
context.perform(action, annotation);
if (nextSelectedID && context.hasEntity(nextSelectedID)) {
context.enter(modeSelect(context, [nextSelectedID]));
context.enter(
modeSelect(context, [nextSelectedID]).follow(true).suppressMenu(true)
);
} else {
context.enter(modeBrowse(context));
}
context.perform(action, annotation);
};