diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-10-01 19:18:14 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-10-01 19:18:14 +0200 |
| commit | 709c9868de7c4ac4985ed4e0055ae3e3e49742ad (patch) | |
| tree | e90227a947bddf47b3043fcbe8b99529a22aa7dd /addons/mail/static/src/js/mail.js | |
| parent | 85f26244a71a0b9a7faa283d6d24fdde6bae899a (diff) | |
| parent | e8831932464814ed5f9e3a0af33f98891a466417 (diff) | |
[MERGE] forward port of branch 8.0 up to e883193
Diffstat (limited to 'addons/mail/static/src/js/mail.js')
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index fc4f498ad94..a42bc417683 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -880,7 +880,7 @@ openerp.mail = function (session) { self.parent_thread.message_fetch(this.domain, this.context, false, function (arg, data) { self.id = false; // insert the message on dom after this message - self.parent_thread.switch_new_message( data, self.$el ); + self.parent_thread.switch_new_message( data, self.$el.parent() ); self.animated_destroy(200); }); @@ -1021,8 +1021,8 @@ openerp.mail = function (session) { on_expand: function (event) { event.stopPropagation(); - this.$('.oe_msg_body_short:first').toggle(); - this.$('.oe_msg_body_long:first').toggle(); + this.$('.oe_msg_body:first > .oe_msg_body_short:first').toggle(); + this.$('.oe_msg_body:first > .oe_msg_body_long:first').toggle(); return false; }, |