CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-07 20:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8442 from openstreetmap/8441-move-rotate

Browse Source 
In move/rotate cancel, check whether graph has changed before popping
This commit is contained in:
Milos Brzakovic
2021-06-22 11:15:56 +02:00
committed by GitHub
parent a0c2c843ec 2651e7ddc9
commit 7cb2ff7f54
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/modes/move.js
View File

@@ -113,10 +113,10 @@ export function modeMove(context, entityIDs, baseGraph) {
function cancel() {
if (baseGraph) {
while (context.graph() !== baseGraph) context.pop();
while (context.graph() !== baseGraph) context.pop(); // reset to baseGraph
context.enter(modeBrowse(context));
} else {
context.pop();
if (_prevGraph) context.pop(); // remove the move
context.enter(modeSelect(context, entityIDs));
}
stopNudge();

3
modules/modes/rotate.js
View File

@@ -119,7 +119,7 @@ export function modeRotate(context, entityIDs) {
function cancel() {
context.pop();
if (_prevGraph) context.pop(); // remove the rotate
context.enter(modeSelect(context, entityIDs));
}
@@ -130,6 +130,7 @@ export function modeRotate(context, entityIDs) {
mode.enter = function() {
_prevGraph = null;
context.features().forceVisible(entityIDs);
behaviors.forEach(context.install);