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

[FIX] web_editor: properly handle editor enabling and preview mode

Browse Source 
The editor panel keeps tracks of the SnippetEditor instances which are
enabled at the current time. When previewing one (by hovering its UI),
that tracking was messed up making onFocus and onBlur calls inconsitent.

Part of https://github.com/odoo/odoo/pull/74959

X-original-commit: 0d7e660d8c0941b1af83b08a90d936933287d681
This commit is contained in:
qsm-odoo
2021-08-24 09:27:35 +00:00
parent 085f388b5e
commit ad644d9ae7
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/editor/snippets.editor.js
+9 -8
View File
@@ -1753,18 +1753,20 @@ var SnippetsMenu = Widget.extend({
return editorToEnable;
}
const editorToEnableHierarchy = [];
let current = editorToEnable;
while (current && current.$target) {
editorToEnableHierarchy.push(current);
current = current.getParent();
if (!previewMode) {
this._enabledEditorHierarchy = [];
let current = editorToEnable;
while (current && current.$target) {
this._enabledEditorHierarchy.push(current);
current = current.getParent();
}
}
// First disable all editors...
for (let i = this.snippetEditors.length; i--;) {
const editor = this.snippetEditors[i];
editor.toggleOverlay(false, previewMode);
if (!previewMode && !editorToEnableHierarchy.includes(editor)) {
if (!previewMode && !this._enabledEditorHierarchy.includes(editor)) {
editor.toggleOptions(false);
}
}
@@ -1773,7 +1775,7 @@ var SnippetsMenu = Widget.extend({
if (editorToEnable) {
editorToEnable.toggleOverlay(true, previewMode);
if (!previewMode && !editorToEnable.displayOverlayOptions) {
const parentEditor = editorToEnableHierarchy.find(ed => ed.displayOverlayOptions);
const parentEditor = this._enabledEditorHierarchy.find(ed => ed.displayOverlayOptions);
if (parentEditor) {
parentEditor.toggleOverlay(true, previewMode);
}
@@ -1788,7 +1790,6 @@ var SnippetsMenu = Widget.extend({
});
}
this._enabledEditorHierarchy = editorToEnableHierarchy;
return editorToEnable;
});
});