From 23df5ab4ed3f0ad3164ce70613fadea34cbaf1d0 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Thu, 14 Oct 2021 13:17:19 +0000
Subject: [PATCH] [FIX] web_editor: keep div inline styles on convert to table

When converting a div to a table, we apply some styles to undo the
table's default styles. This makes sure these styles don't override any
inline styles the div might have been holding.

X-original-commit: 0fad86b330a0e1a3228bbbe76fd2b7370cff3eb0
Part-of: odoo/odoo#80621
---
 addons/web_editor/static/src/js/backend/convert_inline.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web_editor/static/src/js/backend/convert_inline.js b/addons/web_editor/static/src/js/backend/convert_inline.js
index 37245fbd0fd..ca0ca8c8fe7 100644
--- a/addons/web_editor/static/src/js/backend/convert_inline.js
+++ b/addons/web_editor/static/src/js/backend/convert_inline.js
@@ -385,7 +385,11 @@ function _createTable(attributes = []) {
         delete layoutStyles['line-height'];
         $table.css(layoutStyles);
     } else {
-        $table.css(tableStyles);
+        for (const styleName in tableStyles) {
+            if (!('style' in attributes && attributes.style.value.includes(styleName + ':'))) {
+                $table.css(styleName, tableStyles[styleName]);
+            }
+        }
     }
     return $table;
 }