Skip to content

Commit

Permalink
add message between two undos necessary to undo all merge changes
Browse files Browse the repository at this point in the history
	ref #1636
  • Loading branch information
Jack Grossman committed Nov 18, 2019
1 parent b5866a2 commit f524f5e
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions modules/core/history.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,17 @@ export function coreHistory(context) {
}

dispatch.call('undone', this, _stack[_index]);

let hasChanges = Hoot.context.history().hasChanges();

if ( hasChanges ) {
let message = 'Please resolve or undo the current feature changes before proceeding to the next review.',
type = 'warn';

Hoot.message.alert( { message, type } );
return;
}

return change(previous);
},

Expand Down

0 comments on commit f524f5e

Please sign in to comment.