From 9a66619db33fca5f0cb81d9f6bfeb0fb0290cf68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Tue, 17 Sep 2019 15:10:01 +0000
Subject: [FIX] mail: no wait init_messaging before loading webclient
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, discuss widgets had to wait for the route
`mail/init_messaging`. This behaviour slowed down the loading of the
web client.

This commit solves the issue by rendering discuss widgets even when
`mail/init_messaging` hasn't been resolved. For instance, the
messaging menu displays a spinner until messaging becomes ready.

Task-Id 2072835

closes odoo/odoo#37031

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/xml/discuss.xml | 9 ++++++++-
 addons/mail/static/src/xml/systray.xml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml
index a4637ad9e02..87d98bc3c49 100644
--- a/addons/mail/static/src/xml/discuss.xml
+++ b/addons/mail/static/src/xml/discuss.xml
@@ -8,8 +8,15 @@
     -->
     <t t-name="mail.discuss">
         <div class="o_mail_discuss">
-            <div class="o_mail_discuss_sidebar"/>
+            <div class="o_mail_discuss_sidebar">
+                <div class="o_mail_discuss_loading">
+                    <i class="fa fa-spinner fa-spin"/> Please wait...
+                </div>
+            </div>
             <div class="o_mail_discuss_content">
+                <div class="o_mail_discuss_loading">
+                    <i class="fa fa-spinner fa-spin"/> Please wait...
+                </div>
             </div>
         </div>
     </t>
diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml
index db591b31c59..a5677f9da9f 100644
--- a/addons/mail/static/src/xml/systray.xml
+++ b/addons/mail/static/src/xml/systray.xml
@@ -7,7 +7,7 @@
     <t t-name="mail.systray.MessagingMenu">
         <li class="o_mail_systray_item">
             <a class="dropdown-toggle o-no-caret" data-toggle="dropdown" data-display="static" aria-expanded="false" title="Conversations" href="#" role="button">
-                <i class="fa fa-comments" role="img" aria-label="Messages"/> <span class="o_notification_counter badge badge-pill"/>
+                <i class="o_mail_messaging_menu_icon fa fa-comments fa-spinner fa-spin" role="img" aria-label="Messages"/> <span class="o_notification_counter badge badge-pill"/>
             </a>
             <div class="o_mail_systray_dropdown dropdown-menu dropdown-menu-right" role="menu">
                 <t t-if="widget.isMobile()">
-- 
cgit v1.2.3