diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-12-10 13:05:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-12-10 13:05:58 +0100 |
| commit | 82a495eed52a9f42e5b88caa52c20a85f8d81ce3 (patch) | |
| tree | 6c5e8cc0247d5fe08d24e9abae38fe353fbebc56 /addons/mail/static/src/js/thread.js | |
| parent | 0bc2ddae784bf80c4c809d8b7f6d642d576f92a1 (diff) | |
| parent | 4022493c0b85f966e499b6c03ac7cce5556f15e6 (diff) | |
[MERGE] forward port of branch saas-7 up to 4022493
Diffstat (limited to 'addons/mail/static/src/js/thread.js')
| -rw-r--r-- | addons/mail/static/src/js/thread.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js index a1f8fc8a076..86b34255cf7 100644 --- a/addons/mail/static/src/js/thread.js +++ b/addons/mail/static/src/js/thread.js @@ -34,8 +34,9 @@ var Thread = Widget.extend({ this.$('.o_thread_message').removeClass('o_thread_selected_message'); $(event.currentTarget).toggleClass('o_thread_selected_message', !selected); }, - "click span.oe_mail_expand": function (event) { + "click .oe_mail_expand": function (event) { event.preventDefault(); + event.stopPropagation(); var $source = $(event.currentTarget); $source.parents('.o_thread_message_core').find('.o_mail_body_short').toggle(); $source.parents('.o_thread_message_core').find('.o_mail_body_long').toggle(); @@ -118,12 +119,13 @@ var Thread = Widget.extend({ msg.hour = msg.date.fromNow(); } else if (date === moment().subtract(1, 'days').format('YYYY-MM-DD')) { msg.day = _t("Yesterday"); - msg.hour = msg.date.format('hh:mm'); + msg.hour = msg.date.format('LT'); } else { msg.day = msg.date.format('LL'); - msg.hour = msg.date.format('hh:mm'); + msg.hour = msg.date.format('LT'); } + msg.display_subject = message.subject && message.message_type !== 'notification' && !(message.model && (message.model !== 'mail.channel')); return msg; }, |