diff options
| author | Alexandre Kühn <aku@odoo.com> | 2018-08-21 12:44:36 +0200 |
|---|---|---|
| committer | Alexandre Kühn <aku@odoo.com> | 2018-08-21 16:57:51 +0200 |
| commit | 4fa071339a8f381b1336fe326577c9decc04a1e1 (patch) | |
| tree | d9c17ccda8db51a113cf4881340ee0590fbcd1e9 /addons/mail/static/src/xml/thread.xml | |
| parent | 7e7e72edfd35edeb1bd08c1c66c83e4961783700 (diff) | |
[FIX] mail: "is typing..." notification sticky top for DESC threads
Before this commit, the 'is typing...' notification bar was sticky
to the bottom of the thread, independently of the ASC or DESC mode
order of threads.
This is okay for ASC, but not for DESC: it should stick to the
visible top of the thread for DESC.
As a result, this notification bar was always at the top of the
thread, without the 'sticky' behaviour:
+--------[top]--------+
| X is typing... |
| |
| (newer messages) |
| |
|- - - - - - - - - - -| <---- visible top
| |
| ... |
| message i + 1 |
| message i |
| ... |
| |
|- - - - - - - - - - -| <---- visible bottom
| |
| (older messages) |
| |
+------[bottom]-------+
With this commit, the 'is typing...' notification bar sticks
to the visible top of DESC threads:
+--------[top]--------+
| |
| (newer messages) |
| |
|- - - - - - - - - - -| <---- visible top
| X is typing... |
| ... |
| message i + 1 |
| message i |
| ... |
| |
|- - - - - - - - - - -| <---- visible bottom
| |
| (older messages) |
| |
+------[bottom]-------+
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 3cfaa19cb3d..d88418ee921 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -167,7 +167,7 @@ ASC Order --> <t t-name="mail.widget.Thread.Content.ASC"> - <div class="o_mail_thread_content_asc"> + <div class="o_mail_thread_content"> <t t-if="options.displayLoadMore" t-call="mail.widget.Thread.LoadMore"/> <t t-call="mail.widget.Thread.Messages"/> <t t-if="options.displayBottomThreadFreeSpace"> @@ -196,7 +196,7 @@ --> <t t-name="mail.widget.Thread.Content.DESC"> - <div class="o_mail_thread_content_desc"> + <div class="o_mail_thread_content"> <t t-if="options.messagesSeparatorPosition == 'top'" t-call="mail.MessagesSeparator"/> <t t-set="messages" t-value="messages.slice().reverse()"/> <t t-if="thread.hasTypingNotification()" t-call="mail.widget.Thread.TypingNotificationBar"/> @@ -209,9 +209,14 @@ @param {mail.model.AbstractThread} thread --> <t t-name="mail.widget.Thread.TypingNotificationBar"> - <div class="o_thread_typing_notification_free_space" t-if="options.displayOrder === ORDER.ASC"/> - <div class="o_thread_typing_notification_bar"/> - <div class="o_thread_typing_notification_free_space" t-if="options.displayOrder === ORDER.DESC"/> + <t t-if="options.displayOrder === ORDER.ASC"> + <div class="o_thread_typing_notification_free_space"/> + <div class="o_thread_typing_notification_bar o_thread_order_asc"/> + </t> + <t t-else=""> + <div class="o_thread_typing_notification_free_space"/> + <div class="o_thread_typing_notification_bar o_thread_order_desc"/> + </t> </t> <!-- |