[FIX][BACK FROM TRASH] mail: chatter: read more / read less

Read more / less feature is back (and probably ugly). It has probably been
removed when refactoring the old chatter.

[FIX] tools: html shortening: encoding issue

5 files changed, 28 insertions, 1 deletions

diff --git a/addons/mail/static/src/js/mail_chat_backend.js b/addons/mail/static/src/js/mail_chat_backend.js
index 6590e893973..d0966dd3088 100644
--- a/addons/mail/static/src/js/mail_chat_backend.js
+++ b/addons/mail/static/src/js/mail_chat_backend.js
@@ -378,6 +378,7 @@ var ChatMailThread = Widget.extend(mail_thread.MailThreadMixin, ControlPanelMixi
         "click .o_mail_thread_show_more > button": "message_load_history",
         // events from MailThreadMixin
         "click .o_mail_redirect": "on_click_redirect",
+        "click .o_mail_expand": "on_message_body_toggle",
         "click .o_mail_thread_message_star": "on_message_star",
         // events specific for ChatMailThread
         "click .o_mail_chat_channel_item": "on_click_channel",
diff --git a/addons/mail/static/src/js/mail_chatter.js b/addons/mail/static/src/js/mail_chatter.js
index 6d031be6404..8fbe8c1ea05 100644
--- a/addons/mail/static/src/js/mail_chatter.js
+++ b/addons/mail/static/src/js/mail_chatter.js
@@ -273,6 +273,7 @@ var ChatterMailThread = form_common.AbstractField.extend(mail_thread.MailThreadM
         "click .o_mail_thread_message_star": "on_message_star",
         "click .o_mail_thread_message_needaction": "on_message_needaction",
         "click .o_mail_thread_show_more": "message_load_history",
+        "click .o_mail_expand": "on_message_body_toggle",
         // toggle message composer (!! declaration order is important !!)
         "click .o_mail_chatter_button_new_message": "on_open_composer",
         "click .o_mail_chatter_button_log_note": "on_open_composer",
diff --git a/addons/mail/static/src/js/mail_thread.js b/addons/mail/static/src/js/mail_thread.js
index bcd9f47410d..6511e6a6583 100644
--- a/addons/mail/static/src/js/mail_thread.js
+++ b/addons/mail/static/src/js/mail_thread.js
@@ -619,6 +619,16 @@ var MailThreadMixin = {
 
     },
     /**
+     * Toggle short / long body when present (hide signature / crop long
+       messages)
+     */
+    on_message_body_toggle: function (event) {
+        event.preventDefault();
+        var $source = this.$(event.currentTarget);
+        $source.parents('.o_mail_thread_message_core').find('.o_mail_body_short').toggle();
+        $source.parents('.o_mail_thread_message_core').find('.o_mail_body_long').toggle();
+    },
+    /**
      * Toggle a message as 'starred' (or not), by toggling the 'o_mail_message_starred' css class.
      * Trigger when clicking on selector '.o_mail_thread_message_star'.
      */
diff --git a/addons/mail/static/src/less/mail_thread.less b/addons/mail/static/src/less/mail_thread.less
index c502a528c8d..3f7b78201fe 100644
--- a/addons/mail/static/src/less/mail_thread.less
+++ b/addons/mail/static/src/less/mail_thread.less
@@ -44,6 +44,9 @@
             > p {
                 margin: 0 0 9px; // Required by the old design to override a general rule on p's
             }
+            .o_mail_body_long {
+                display: none;
+            }
         }
         .o_mail_thread_message_star, .o_mail_thread_message_needaction {
             cursor: pointer;
diff --git a/addons/mail/static/src/xml/mail_thread.xml b/addons/mail/static/src/xml/mail_thread.xml
index e650dd323fc..1323cb9c21e 100644
--- a/addons/mail/static/src/xml/mail_thread.xml
+++ b/addons/mail/static/src/xml/mail_thread.xml
@@ -141,7 +141,19 @@
                     </t>
                     <!-- normal message -->
                     <t t-if="!(message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0)">
-                        <t t-raw="message.body"/>
+                        <t t-if="message.body_short">
+                            <div class="o_mail_body_short">
+                                <t t-raw="message.body_short"/>
+                                <span class="o_mail_expand"><a href="#">... read more</a></span>
+                            </div>
+                            <div class="o_mail_body_long">
+                                <t t-raw="message.body"/>
+                                <span class="o_mail_expand"><a href="#">... read less</a></span>
+                            </div>
+                        </t>
+                        <t t-if="! message.body_short">
+                            <t t-raw="message.body"/>
+                        </t>
                     </t>
                     <!-- Attachments -->
                     <t t-foreach="message.attachment_ids" t-as="attachment">