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

Don't select the previously-edited node when undoing/redoing (re: #5831)

Browse Source
This commit is contained in:
Quincy Morgan
2019-04-16 14:21:15 -07:00
parent a30e1563b5
commit 84b7e08bf8
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/renderer/map.js
View File

@@ -8,7 +8,7 @@ import { zoom as d3_zoom, zoomIdentity as d3_zoomIdentity } from 'd3-zoom';
import { t } from '../util/locale';
import { geoExtent, geoRawMercator, geoScaleToZoom, geoZoomToScale } from '../geo';
import { modeBrowse, modeSelect } from '../modes';
import { modeBrowse } from '../modes';
import { svgAreas, svgLabels, svgLayers, svgLines, svgMidpoints, svgPoints, svgVertices } from '../svg';
import { uiFlash } from '../ui';
import { utilFastMouse, utilFunctor, utilRebind, utilSetTransform } from '../util';
@@ -95,18 +95,10 @@ export function rendererMap(context) {
osm.on('change.map', immediateRedraw);
}
function didUndoOrRedo(stack, targetTransform) {
function didUndoOrRedo(targetTransform) {
var mode = context.mode().id;
if (mode !== 'browse' && mode !== 'select') return;
var followSelected = false;
if (Array.isArray(stack.selectedIDs)) {
followSelected = (stack.selectedIDs.length === 1 && stack.selectedIDs[0][0] === 'n');
context.enter(
modeSelect(context, stack.selectedIDs).follow(followSelected)
);
}
if (!followSelected && targetTransform) {
if (targetTransform) {
map.transformEase(targetTransform);
}
}
@@ -114,10 +106,10 @@ export function rendererMap(context) {
context.history()
.on('change.map', immediateRedraw)
.on('undone.map', function(stack, fromStack) {
didUndoOrRedo(stack, fromStack.transform);
didUndoOrRedo(fromStack.transform);
})
.on('redone.map', function(stack) {
didUndoOrRedo(stack, stack.transform);
didUndoOrRedo(stack.transform);
});
context.background()