From c6524ee9d60888bb147b77db5e394af8beda05ab Mon Sep 17 00:00:00 2001 From: "Arthur Detroux (ard)" Date: Mon, 8 Aug 2022 13:01:30 +0000 Subject: [PATCH] [FIX] website: adapt carousel options to BS5 Commit [1] migrated to Bootstrap 5 using automation. This mistakenly changed attributes related to Snippet Options. Commit [2] moved the website edition in the backend which created a conflict with the tooltip system of the editor ([data-tooltip="true"]) and the tooltip system of the backend ([data-tooltip="content"]). This commit fixes both these issues by changing the XML and removing the related js code. [1]: https://github.com/odoo/odoo/commit/1fcd098af5fa18e848c66bb83bdceb6ba0308512 [2]: https://github.com/odoo/odoo/commit/31cc10b91dc7762e23b4bde9b945be0c4ce3fe3b task-2687506 closes odoo/odoo#94564 Signed-off-by: Quentin Smetz (qsm) --- .../web_editor/static/src/js/editor/snippets.editor.js | 2 +- addons/website/views/snippets/snippets.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js index 4281a9c878d..826d406c993 100644 --- a/addons/web_editor/static/src/js/editor/snippets.editor.js +++ b/addons/web_editor/static/src/js/editor/snippets.editor.js @@ -1449,7 +1449,7 @@ var SnippetsMenu = Widget.extend({ // Add tooltips on we-title elements whose text overflows this.$el.tooltip({ - selector: 'we-title, [data-tooltip="true"]', + selector: 'we-title', placement: 'bottom', delay: 100, title: function () { diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml index e7eb4ddd166..e00a4e81275 100644 --- a/addons/website/views/snippets/snippets.xml +++ b/addons/website/views/snippets/snippets.xml @@ -447,16 +447,16 @@ None
- - - - + + + +