Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-16 13:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix link/doc/image/embed choosers crashing Draftail in IE11

Browse source
This commit is contained in:
Thibaud Colas 2018-02-10 18:00:39 +02:00 committed by Matt Westcott
parent 08ae63e1d8
commit 3f002e82e1
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/src/components/Draftail/sources/ModalWorkflowSource.js
View file

@ -119,7 +119,7 @@ class ModalWorkflowSource extends Component {
$(document.body).on('hidden.bs.modal', this.onClose);
// eslint-disable-next-line new-cap
global.ModalWorkflow({
this.workflow = global.ModalWorkflow({
url,
urlParams,
responses: {
@ -138,6 +138,8 @@ class ModalWorkflowSource extends Component {
}
componentWillUnmount() {
this.workflow = null;
$(document.body).off('hidden.bs.modal', this.onClose);
}
@ -172,6 +174,11 @@ class ModalWorkflowSource extends Component {
}
}
// IE11 crashes when rendering the new entity in contenteditable if the modal is still open.
// Other browsers do not mind. This is probably a focus management problem.
// From the user's perspective, this is all happening too fast to notice either way.
this.workflow.close();
onComplete(nextState);
}

9
client/src/components/Draftail/sources/ModalWorkflowSource.test.js
View file

@ -210,6 +210,7 @@ describe('ModalWorkflowSource', () => {
jest.spyOn(RichUtils, 'toggleLink');
const onComplete = jest.fn();
const close = jest.fn();
let editorState = EditorState.createWithContent(convertFromRaw({
entityMap: {},
@ -235,10 +236,12 @@ describe('ModalWorkflowSource', () => {
/>
));
wrapper.instance().workflow = { close };
wrapper.instance().onChosen({});
expect(onComplete).toHaveBeenCalled();
expect(RichUtils.toggleLink).toHaveBeenCalled();
expect(close).toHaveBeenCalled();
RichUtils.toggleLink.mockRestore();
});
@ -247,6 +250,7 @@ describe('ModalWorkflowSource', () => {
jest.spyOn(AtomicBlockUtils, 'insertAtomicBlock');
const onComplete = jest.fn();
const close = jest.fn();
let editorState = EditorState.createWithContent(convertFromRaw({
entityMap: {},
@ -274,10 +278,12 @@ describe('ModalWorkflowSource', () => {
/>
));
wrapper.instance().workflow = { close };
wrapper.instance().onChosen({});
expect(onComplete).toHaveBeenCalled();
expect(AtomicBlockUtils.insertAtomicBlock).toHaveBeenCalled();
expect(close).toHaveBeenCalled();
AtomicBlockUtils.insertAtomicBlock.mockRestore();
});
@ -286,6 +292,7 @@ describe('ModalWorkflowSource', () => {
jest.spyOn(Modifier, 'replaceText');
const onComplete = jest.fn();
const close = jest.fn();
let editorState = EditorState.createWithContent(convertFromRaw({
entityMap: {},
@ -310,6 +317,7 @@ describe('ModalWorkflowSource', () => {
/>
));
wrapper.instance().workflow = { close };
wrapper.instance().onChosen({
url: 'example.com',
prefer_this_title_as_link_text: true,
@ -317,6 +325,7 @@ describe('ModalWorkflowSource', () => {
expect(onComplete).toHaveBeenCalled();
expect(Modifier.replaceText).toHaveBeenCalled();
expect(close).toHaveBeenCalled();
Modifier.replaceText.mockRestore();
});