summaryrefslogtreecommitdiff
path: root/addons/mail/static
diff options
context:
space:
mode:
authorXavier Dubuc <xdu@odoo.com>2020-12-24 15:01:38 +0000
committerXavier Dubuc <xdu@odoo.com>2021-01-13 10:52:41 +0000
commitb850a4ee4ed6688d7d5d1f51e29015cd279495bb (patch)
tree8a39dfe7ef88af59f6bb1f557c5b41994a5b16d7 /addons/mail/static
parentc1d5a077f26d5cb5f42888f21dafd78e3432853f (diff)
[FIX] mail: fix click event handling when renaming DM
task-2414811 closes odoo/odoo#63785 Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Diffstat (limited to 'addons/mail/static')
-rw-r--r--addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js4
-rw-r--r--addons/mail/static/src/components/editable_text/editable_text.js3
2 files changed, 7 insertions, 0 deletions
diff --git a/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js b/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js
index 26499d0f179..e513914d2f9 100644
--- a/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js
+++ b/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js
@@ -6,6 +6,7 @@ const components = {
ThreadIcon: require('mail/static/src/components/thread_icon/thread_icon.js'),
};
const useStore = require('mail/static/src/component_hooks/use_store/use_store.js');
+const { isEventHandled } = require('mail/static/src/utils/utils.js');
const Dialog = require('web.Dialog');
@@ -117,6 +118,9 @@ class DiscussSidebarItem extends Component {
* @param {MouseEvent} ev
*/
_onClick(ev) {
+ if (isEventHandled(ev, 'EditableText.click')) {
+ return;
+ }
this.thread.open();
}
diff --git a/addons/mail/static/src/components/editable_text/editable_text.js b/addons/mail/static/src/components/editable_text/editable_text.js
index 4a4b926741e..6e0b682fc53 100644
--- a/addons/mail/static/src/components/editable_text/editable_text.js
+++ b/addons/mail/static/src/components/editable_text/editable_text.js
@@ -1,6 +1,8 @@
odoo.define('mail/static/src/components/editable_text/editable_text.js', function (require) {
'use strict';
+const { markEventHandled } = require('mail/static/src/utils/utils.js');
+
const { Component } = owl;
class EditableText extends Component {
@@ -31,6 +33,7 @@ class EditableText extends Component {
* @param {MouseEvent} ev
*/
_onClick(ev) {
+ markEventHandled(ev, 'EditableText.click');
this.trigger('o-clicked');
}