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

Remove annotatedChange events (we'll replace with something else)

Browse Source
This commit is contained in:
Bryan Housel
2019-04-03 11:56:56 -04:00
parent d40378d27d
commit 561ffc402a
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/context.js
View File

@@ -468,7 +468,7 @@ export function coreContext() {
validator.validate();
});
// re-run validation upon a significant graph change
history.on('annotatedChange', function(difference) {
history.on('change', function(difference) {
if (difference) {
validator.validate();
}

21
modules/core/history.js
View File

@@ -14,7 +14,7 @@ import {
export function coreHistory(context) {
var dispatch = d3_dispatch('change', 'annotatedChange', 'merge', 'restore', 'undone', 'redone');
var dispatch = d3_dispatch('change', 'merge', 'restore', 'undone', 'redone');
var lock = utilSessionMutex('lock');
var duration = 150;
var _imageryUsed = [];
@@ -56,7 +56,7 @@ export function coreHistory(context) {
var actionResult = _act(args, t);
_stack.push(actionResult);
_index++;
return change(previous, actionResult.annotation);
return change(previous);
}
@@ -66,7 +66,7 @@ export function coreHistory(context) {
// assert(_index == _stack.length - 1)
var actionResult = _act(args, t);
_stack[_index] = actionResult;
return change(previous, actionResult.annotation);
return change(previous);
}
@@ -81,20 +81,15 @@ export function coreHistory(context) {
var actionResult = _act(args, t);
_stack.push(actionResult);
_index++;
return change(previous, actionResult.annotation);
return change(previous);
}
// determine difference and dispatch a change event
function change(previous, isAnnotated) {
function change(previous) {
var difference = coreDifference(previous, history.graph());
if (!_pausedGraph) {
dispatch.call('change', this, difference);
if (isAnnotated) {
// actions like dragging a node can fire lots of changes,
// so use 'annotatedChange' to listen for grouped undo/redo changes
dispatch.call('annotatedChange', this, difference);
}
}
return difference;
}
@@ -209,7 +204,7 @@ export function coreHistory(context) {
}
dispatch.call('undone', this, _stack[_index], previousStack);
return change(previous, true);
return change(previous);
},
@@ -229,7 +224,7 @@ export function coreHistory(context) {
}
}
return change(previous, true);
return change(previous);
},
@@ -244,7 +239,7 @@ export function coreHistory(context) {
if (_pausedGraph) {
var previous = _pausedGraph;
_pausedGraph = null;
return change(previous, true);
return change(previous);
}
},