Skip to content

collab_client: Fix race condition with character composition #4983

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.

Sign up for GitHub

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

Merged
rhansen merged 7 commits into from
Mar 30, 2021
Merged

collab_client: Fix race condition with character composition #4983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5dcd53b
collab_client: Factor out duplicate `ACCEPT_COMMIT` code
rhansen Mar 26, 2021
652b36f
collab_client: Delete unused `caughtErrors`
rhansen Mar 26, 2021
07262c3
collab_client: Convert `state` var to `committing` bool
rhansen Mar 27, 2021
023b389
collab_client: Use `Date.now()` instead of casting a Date object
rhansen Mar 27, 2021
e495bbd
collab_client: Redo server message queueing
rhansen Mar 29, 2021
5d2484c
collab_client: Delete unused `NO_COMMIT_PENDING` handling
rhansen Mar 29, 2021
0a64bc8
tests: Add regression tests for character composition race
ingoncalves Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/static/js/ace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const Ace2Editor = function () {
this.getDebugProperty = (prop) => info.ace_getDebugProperty(prop);

this.getInInternationalComposition =
() => loaded ? info.ace_getInInternationalComposition() : false;
() => loaded ? info.ace_getInInternationalComposition() : null;

// prepareUserChangeset:
// Returns null if no new changes or ACE not ready. Otherwise, bundles up all user changes
Expand Down
22 changes: 10 additions & 12 deletions src/static/js/ace2_inner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3504,16 +3504,7 @@ function Ace2Inner(editorInfo, cssManagers) {

const teardown = () => _teardownActions.forEach((a) => a());

let inInternationalComposition = false;
const handleCompositionEvent = (evt) => {
// international input events, fired in FF3, at least; allow e.g. Japanese input
if (evt.type === 'compositionstart') {
inInternationalComposition = true;
} else if (evt.type === 'compositionend') {
inInternationalComposition = false;
}
};

let inInternationalComposition = null;
editorInfo.ace_getInInternationalComposition = () => inInternationalComposition;

const bindTheEventHandlers = () => {
Expand Down Expand Up @@ -3602,8 +3593,15 @@ function Ace2Inner(editorInfo, cssManagers) {
});
});

$(document.documentElement).on('compositionstart', handleCompositionEvent);
$(document.documentElement).on('compositionend', handleCompositionEvent);
$(document.documentElement).on('compositionstart', () => {
if (inInternationalComposition) return;
inInternationalComposition = new Promise((resolve) => {
$(document.documentElement).one('compositionend', () => {
inInternationalComposition = null;
resolve();
});
});
});
};

const topLevel = (n) => {
Expand Down
Loading