[MERGE] forward port branch saas-12.1 up to d3b8422c9c4

closes odoo/odoo#30614

6 files changed, 10 insertions, 16 deletions

diff --git a/addons/mail/static/src/js/discuss.js b/addons/mail/static/src/js/discuss.js
index 9b404e056ea..808cd8338ad 100644
--- a/addons/mail/static/src/js/discuss.js
+++ b/addons/mail/static/src/js/discuss.js
@@ -1229,7 +1229,7 @@ var Discuss = AbstractAction.extend({
      * @private
      */
     _onActivityUpdated: function () {
-        this._throttleUpdateThreads();
+        this._throttledUpdateThreads();
     },
     /**
      * @private
diff --git a/addons/mail/static/src/js/models/mail_failure.js b/addons/mail/static/src/js/models/mail_failure.js
index 9a007954a5a..4c5f93be5dd 100644
--- a/addons/mail/static/src/js/models/mail_failure.js
+++ b/addons/mail/static/src/js/models/mail_failure.js
@@ -93,7 +93,7 @@ var MailFailure = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
             documentModel: this._documentModel,
             id: 'mail_failure',
             imageSRC: this._moduleIcon,
-            title: this._recordName,
+            title: this._modelName,
         };
         return preview;
     },
diff --git a/addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js b/addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js
index 9a5b5abb4cc..f995b4e09b3 100644
--- a/addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js
+++ b/addons/mail/static/src/js/models/threads/mixins/thread_typing_mixin.js
@@ -94,17 +94,17 @@ var ThreadTypingMixin = {
      * Get the text to display when some partners are typing something on the
      * thread:
      *
-     *   - single typing partner:
+     * - single typing partner:
      *
-     *          A is typing...
+     *   A is typing...
      *
-     *   - two typing partners:
+     * - two typing partners:
      *
-     *          A and B are typing...
+     *   A and B are typing...
      *
-     *   - three or more typing partners:
+     * - three or more typing partners:
      *
-     *          A, B and more are typing...
+     *   A, B and more are typing...
      *
      * The choice of the members name for display is not random: it displays
      * the user that have been typing for the longest time. Also, this function
diff --git a/addons/mail/static/src/js/services/mail_notification_manager.js b/addons/mail/static/src/js/services/mail_notification_manager.js
index 140266285c7..b59d7b91434 100644
--- a/addons/mail/static/src/js/services/mail_notification_manager.js
+++ b/addons/mail/static/src/js/services/mail_notification_manager.js
@@ -490,7 +490,7 @@ MailManager.include({
         var self = this;
         var partnerID = data.partner_id;
         this.call('bus_service', 'sendNotification', data.title, data.message, function ( ){
-            self.call('mail_service', 'openDmWindow', partnerID);
+            self.call('mail_service', 'openDMChatWindowFromBlankThreadWindow', partnerID);
         });
     },
     /**
diff --git a/addons/mail/static/src/js/services/mail_window_manager.js b/addons/mail/static/src/js/services/mail_window_manager.js
index 64cf6bb88c9..c8e05957afb 100644
--- a/addons/mail/static/src/js/services/mail_window_manager.js
+++ b/addons/mail/static/src/js/services/mail_window_manager.js
@@ -531,9 +531,6 @@ MailManager.include({
      * @private
      */
     _repositionThreadWindows: function () {
-        if (this._areAllThreadWindowsHidden()) {
-            return;
-        }
         this._computeAvailableSlotsForThreadWindows();
 
         this._repositionVisibleThreadWindows();
@@ -575,9 +572,6 @@ MailManager.include({
      *   the focus is on the thread window.
      */
     _updateThreadWindowsFromMessage: function (message, options) {
-        if (this._areAllThreadWindowsHidden()) {
-            return;
-        }
         _.each(this._threadWindows, function (threadWindow) {
             if (_.contains(message.getThreadIDs(), threadWindow.getID())) {
                 threadWindow.update(options);
diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js
index cc18df64b18..1f31a6ead2f 100644
--- a/addons/mail/static/src/js/utils.js
+++ b/addons/mail/static/src/js/utils.js
@@ -22,7 +22,7 @@ function _parseAndTransform(nodes, transformFunction) {
 
 // Suggested URL Javascript regex of http://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url
 // Adapted to make http(s):// not required if (and only if) www. is given. So `should.notmatch` does not match.
-var urlRegexp = /\b(?:https?:\/\/\d{1,3}(?:\.\d{1,3}){3}|(?:https?:\/\/|(?:www\.))[-a-z0-9@:%._+~#=]{2,256}\.[a-z]{2,13})\b(?:[-a-z0-9@:%_+.~#?&'$//=]*)/gi;
+var urlRegexp = /\b(?:https?:\/\/\d{1,3}(?:\.\d{1,3}){3}|(?:https?:\/\/|(?:www\.))[-a-z0-9@:%._+~#=]{2,256}\.[a-z]{2,13})\b(?:[-a-z0-9@:%_+.~#?&'$//=;]*)/gi;
 function linkify(text, attrs) {
     attrs = attrs || {};
     if (attrs.target === undefined) {