From aa2e1e8db15f44b9efcddc1a16fb7b3514f0f970 Mon Sep 17 00:00:00 2001 From: Deependra Solanki Date: Tue, 6 Feb 2024 17:19:06 +0530 Subject: [PATCH] [FIX] web_editor: update name form block to nodeToToggle in toggleList Commit [1] changed the code in toggleList such that variable block could not be a block. This commit updates the name of variable block to nodeToToggle. [1]: d314fb6a6ceb6bade38a2a6b3e0e2e3fd016b7d9 task-3609500 X-original-commit: b863fff7d8e62dc28d8e5de20dffea6896dc188a Part-of: odoo/odoo#153328 --- .../js/editor/odoo-editor/src/commands/commands.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/commands.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/commands.js index 60699680c45..8bc324ff1b0 100644 --- a/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/commands.js +++ b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/commands.js @@ -549,13 +549,13 @@ export const editorCommands = { } else { // Ensure nav-item lists are excluded from toggling const isNavItemList = node => node.nodeName === 'LI' && node.classList.contains('nav-item'); - let block = closestBlock(node); - block = isNavItemList(block) ? node : block; - if (!['OL', 'UL'].includes(block.tagName) && (block.isContentEditable || block.nodeType === Node.TEXT_NODE)) { - const closestLi = closestElement(block, 'li'); - block = closestLi && !isNavItemList(closestLi) ? closestLi : block; - const ublock = block.nodeName === 'LI' && block.closest('ol, ul'); - ublock && getListMode(ublock) == mode ? li.add(block) : blocks.add(block); + let nodeToToggle = closestBlock(node); + nodeToToggle = isNavItemList(nodeToToggle) ? node : nodeToToggle; + if (!['OL', 'UL'].includes(nodeToToggle.tagName) && (nodeToToggle.isContentEditable || nodeToToggle.nodeType === Node.TEXT_NODE)) { + const closestLi = closestElement(nodeToToggle, 'li'); + nodeToToggle = closestLi && !isNavItemList(closestLi) ? closestLi : nodeToToggle; + const ublock = nodeToToggle.nodeName === 'LI' && nodeToToggle.closest('ol, ul'); + ublock && getListMode(ublock) == mode ? li.add(nodeToToggle) : blocks.add(nodeToToggle); } } }