Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop next change from merging with previous one after inactive period. #530

Merged

Conversation

JordanMartinez
Copy link
Contributor

Addresses #362.

This should really be changed in UndoFX. But since that won't have a new release in the foreseeable future, this can bring the same functionality until such a release exists.

@JordanMartinez
Copy link
Contributor Author

This PR needs a test to prove that the merge prevention actually occurs.

@JordanMartinez
Copy link
Contributor Author

JordanMartinez commented Jun 22, 2017

I also realized that the test in UndoManagerTest called deletingTextThatWasJustInsertedShouldNotMergeTheTwoChanges() is no longer needed due to reverting back to the original merge behavior in #496. I'll remove that in a separate PR.

@JordanMartinez JordanMartinez force-pushed the preventUndoMergeOnInactivity branch 2 times, most recently from c81f706 to ab882f0 Compare June 22, 2017 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant