[FIX] web_editor: prevent deadlock when removing child snippet of popup

closes odoo/odoo#63410

X-original-commit: b087f6a0c7b708ba45ad465310ac8064d3732591
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
This commit is contained in:
Antoine Guenet
2020-12-15 15:40:34 +00:00
parent 83b81cc44d
commit c9d9b4cc2c
@@ -349,6 +349,7 @@ var SnippetEditor = Widget.extend({
this.toggleOverlay(false);
this.toggleOptions(false);
let removableParent;
const removeSnippet = async (context) => {
await new Promise(resolve => {
this.trigger_up('call_for_each_child_snippet', {
@@ -386,9 +387,7 @@ var SnippetEditor = Widget.extend({
editor = $parent.data('snippet-editor');
}
if (isEmptyAndRemovable($parent, editor)) {
await new Promise((resolve)=> {
setTimeout(() => editor.removeSnippet().then(resolve));
});
removableParent = editor;
}
}
@@ -410,6 +409,11 @@ var SnippetEditor = Widget.extend({
}
};
await this.wysiwyg.withDomMutations($('#wrapwrap'), removeSnippet);
if (removableParent) {
await new Promise((resolve)=> {
setTimeout(() => removableParent.removeSnippet().then(resolve));
});
}
},
/**
* Displays/Hides the editor overlay.