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

Don't change history state while in transition

Browse Source
This commit is contained in:
Bryan Housel
2017-01-04 17:37:29 -05:00
parent 8ce6b9e185
commit ddd1b7e43a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/core/history.js
View File

@@ -113,8 +113,7 @@ export function coreHistory(context) {
perform: function() {
// complete any transition already in progress
d3.select(document)
.interrupt('history.perform');
d3.select(document).interrupt('history.perform');
var transitionable = false,
action0 = arguments[0];
@@ -149,19 +148,22 @@ export function coreHistory(context) {
replace: function() {
d3.select(document).interrupt('history.perform');
return _replace(arguments, 1);
},
// Same as calling pop and then perform
overwrite: function() {
d3.select(document).interrupt('history.perform');
return _overwrite(arguments, 1);
},
pop: function() {
var previous = stack[index].graph;
d3.select(document).interrupt('history.perform');
var previous = stack[index].graph;
if (index > 0) {
index--;
stack.pop();
@@ -171,6 +173,8 @@ export function coreHistory(context) {
undo: function() {
d3.select(document).interrupt('history.perform');
var previous = stack[index].graph;
// Pop to the next annotated state.
@@ -185,8 +189,9 @@ export function coreHistory(context) {
redo: function() {
var previous = stack[index].graph;
d3.select(document).interrupt('history.perform');
var previous = stack[index].graph;
while (index < stack.length - 1) {
index++;
if (stack[index].annotation) break;