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

[FIX] web_editor: prevent traceback on remove highlight color

Browse Source 
This prevents a traceback when no closest block to the root node can be
found in the sanitizer.

task-2796371

closes odoo/odoo#87187

X-original-commit: 2104f33985472cd59f067d2f1403518a332fac6d
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
This commit is contained in:
Antoine Guenet
2022-03-24 18:10:51 +01:00
parent 6b0a59c951
commit ad7c0d8ea4
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/lib/odoo-editor/src/utils/sanitize.js
+12 -7
View File
@@ -78,15 +78,20 @@ export function areSimilarElements(node, node2) {
class Sanitize {
constructor(root) {
this.root = root;
// Remove unique ids from checklists and stars. These will be renewed
// afterwards.
for (const node of closestBlock(root).querySelectorAll('[id^=checkId-]')) {
node.removeAttribute('id');
const rootClosestBlock = closestBlock(root);
if (rootClosestBlock) {
// Remove unique ids from checklists and stars. These will be
// renewed afterwards.
for (const node of rootClosestBlock.querySelectorAll('[id^=checkId-]')) {
node.removeAttribute('id');
}
}
this.parse(root);
// Ensure unique ids on checklists and stars.
for (const node of closestBlock(root).querySelectorAll('.o_checklist > li, .o_stars')) {
node.setAttribute('id', `checkId-${Math.floor(new Date() * Math.random())}`);
if (rootClosestBlock) {
// Ensure unique ids on checklists and stars.
for (const node of rootClosestBlock.querySelectorAll('.o_checklist > li, .o_stars')) {
node.setAttribute('id', `checkId-${Math.floor(new Date() * Math.random())}`);
}
}
}