From 9c8b0e299a1a9364f30d8aaa63e4d01401ac7eb8 Mon Sep 17 00:00:00 2001
From: "Emilien Durieu (edu)" <edu@odoo.com>
Date: Tue, 17 Aug 2021 15:04:14 +0000
Subject: [PATCH] [FIX] web_editor: prevent merging of unbreakable node

closes odoo/odoo#75432

X-original-commit: 1632bf17090b38eb8998edb09c1522929dc0312b
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 addons/web_editor/static/lib/odoo-editor/src/utils/sanitize.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_editor/static/lib/odoo-editor/src/utils/sanitize.js b/addons/web_editor/static/lib/odoo-editor/src/utils/sanitize.js
index 90f04db0e94..f93f8f72769 100644
--- a/addons/web_editor/static/lib/odoo-editor/src/utils/sanitize.js
+++ b/addons/web_editor/static/lib/odoo-editor/src/utils/sanitize.js
@@ -12,6 +12,7 @@ import {
     isFontAwesome,
     isMediaElement,
     getDeepRange,
+    isUnbreakable,
 } from './utils.js';
 
 const NOT_A_NUMBER = /[^\d]/g;
@@ -93,7 +94,7 @@ class Sanitize {
         }
 
         // Merge identical elements together
-        while (areSimilarElements(node, node.previousSibling)) {
+        while (areSimilarElements(node, node.previousSibling) && !isUnbreakable(node)) {
             getDeepRange(this.root, { select: true });
             const restoreCursor = preserveCursor(this.root.ownerDocument);
             const nodeP = node.previousSibling;