From 8e1bc74a67ddf0db7d7204cb4fb01c2a7eb29566 Mon Sep 17 00:00:00 2001 From: Rodolpho Lima Date: Thu, 13 Apr 2023 16:06:58 +0000 Subject: [PATCH] [FIX] web_editor: prevent colorpicker close on click Since Bootstrap was updagraded to 5.1.3, `ev.clickEvent` is no longer a `JQuery.Event`. Therefore, the `originalEvent` property does not exist anymore, and `__isColorpickerClick` can be accessed directly from `ev.ClickEvent`. By checking for the non-existent `originalEvent` property, the mechanism that enables the colorpicker to remain open when clicked was being hindered. Note that this handler's `ev` remains a `JQuery.Event`, and if a handler returns `false`, it will prevent the default action and stop the event propagating. task-3274987 closes odoo/odoo#119429 X-original-commit: 6db128f7f859d7bb0f96b15b4e6a38955932f7cf Signed-off-by: David Monjoie (dmo) --- addons/web_editor/static/src/js/wysiwyg/wysiwyg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js index c9578a2ddcb..03fb1a21bbb 100644 --- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js +++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js @@ -1691,7 +1691,7 @@ const Wysiwyg = Widget.extend({ let manualOpening = false; // Prevent dropdown closing on colorpicker click $dropdown.on('hide.bs.dropdown', ev => { - return !(ev.clickEvent && ev.clickEvent.originalEvent && ev.clickEvent.originalEvent.__isColorpickerClick); + return !(ev.clickEvent && ev.clickEvent.__isColorpickerClick); }); $dropdown.on('show.bs.dropdown', () => { if (manualOpening) {