pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_editor: better urgent save for to inline html field

Browse Source 
Reorganize the urgent save steps to call `_toInline` before the urgent `updateValue`.
This will give a chance to the _toInline to finish before the `updateValue`
if no asynchronous process is triggered during the inlining process.

In case we have some async stuff that delay the `_toInline` completion,
we keep the second `updateValue` which will wait for the asynchronous completion, as before.

task-3222474

X-original-commit: 85540a58a58b5f60b587697490fe837b3e4a69ec
Part-of: odoo/odoo#124020
This commit is contained in:
Sébastien Geelen (sge)
2023-06-07 08:59:09 +02:00
parent 722d5fb225
commit 74dc80e796
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/backend/html_field.js
+10 -4
View File
@@ -397,15 +397,21 @@ export class HtmlField extends Component {
}
async commitChanges({ urgent } = {}) {
if (this._isDirty() || urgent) {
let toInlinePromise;
if (this.wysiwyg) {
this.wysiwyg.odooEditor.observerUnactive('commitChanges');
await this.wysiwyg.savePendingImages();
if (this.props.isInlineStyle) {
// Avoid listening to changes made during the _toInline process.
toInlinePromise = this._toInline();
}
}
if (urgent) {
await this.updateValue();
}
if (this.wysiwyg) {
// Avoid listening to changes made during the _toInline process.
this.wysiwyg.odooEditor.observerUnactive('commitChanges');
await this.wysiwyg.savePendingImages();
if (this.props.isInlineStyle) {
await this._toInline();
await toInlinePromise;
}
this.wysiwyg.odooEditor.observerActive('commitChanges');
}