[MERGE] forward port of branch saas-9 up to 87a01c7

4 files changed, 40 insertions, 59 deletions

diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index 803296e4473..fcc7cffd5d1 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -134,7 +134,7 @@ function strip_html (node, transform_children) {
 function inline (node, transform_children) {
     if (node.nodeType === 3) return node.data;
     if (node.tagName === "BR") return " ";
-    if (node.tagName.match(/^(A|P|DIV|PRE)$/)) return transform_children();
+    if (node.tagName.match(/^(A|P|DIV|PRE|BLOCKQUOTE)$/)) return transform_children();
     node.innerHTML = transform_children();
     return node.outerHTML;
 }
@@ -148,7 +148,7 @@ function add_message (data, options) {
     var msg = _.findWhere(messages, { id: data.id });
 
     if (!msg) {
-        msg = make_message(data);
+        msg = chat_manager.make_message(data);
         // Keep the array ordered by id when inserting the new message
         messages.splice(_.sortedIndex(messages, msg, 'id'), 0, msg);
         _.each(msg.channel_ids, function (channel_id) {
@@ -298,7 +298,7 @@ function add_channel (data, options) {
             chat_manager.bus.trigger("channel_toggle_fold", channel);
         }
     } else {
-        channel = make_channel(data, options);
+        channel = chat_manager.make_channel(data, options);
         channels.push(channel);
         channels = _.sortBy(channels, function (channel) { return channel.name.toLowerCase(); });
         if (!options.silent) {
@@ -677,6 +677,10 @@ function on_presence_notification (data) {
 // Public interface
 //----------------------------------------------------------------------------------
 var chat_manager = {
+    // these two functions are exposed for extensibility purposes and shouldn't be called by other modules
+    make_message: make_message,
+    make_channel: make_channel,
+
     post_message: function (data, options) {
         options = options || {};
         var msg = {
@@ -773,9 +777,9 @@ var chat_manager = {
             return $.when();
         }
     },
-    mark_all_as_read: function (channel) {
-        if ((!channel && needaction_counter) || (channel && channel.needaction_counter)) {
-            return MessageModel.call('mark_all_as_read', channel ? [[channel.id]] : []);
+    mark_all_as_read: function (channel, domain) {
+        if ((channel.id === "channel_inbox" && needaction_counter) || (channel && channel.needaction_counter)) {
+            return MessageModel.call('mark_all_as_read', [], {channel_ids: channel.id !== "channel_inbox" ? [channel.id] : [], domain: domain});
         }
         return $.when();
     },
diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index 66acfae8228..f55644ad8bc 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -33,7 +33,6 @@ var Followers = form_common.AbstractField.extend({
         this.image = this.node.attrs.image || 'image_small';
         this.comment = this.node.attrs.help || false;
         this.ds_model = new data.DataSetSearch(this, this.view.model);
-        this.ds_users = new data.DataSetSearch(this, 'res.users');
 
         this.value = [];
         this.followers = [];
@@ -191,25 +190,11 @@ var Followers = form_common.AbstractField.extend({
     fetch_followers: function (value_) {
         this.value = value_ || [];
         return ajax.jsonRpc('/mail/read_followers', 'call', {'follower_ids': this.value})
-            .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
+            .then(this.proxy('display_followers'), this.proxy('display_generic'))
             .then(this.proxy('display_buttons'))
             .then(this.proxy('fetch_subtypes'));
     },
 
-    /** Read on res.partner failed: fall back on a generic case
-        - fetch current user partner_id (call because no other smart solution currently) FIXME
-        - then display a generic message about followers */
-    fetch_generic: function () {
-        var self = this;
-
-        return this.ds_users.call('read', [[session.uid], ['partner_id']])
-            .then(function (results) {
-                var pid = results[0].partner_id[0];
-                self.message_is_follower = (_.indexOf(self.value, pid) !== -1);
-            })
-            .then(self.proxy('display_generic'));
-    },
-
     _format_followers: function (count){
         var str = '';
         if(count <= 0){
@@ -222,9 +207,11 @@ var Followers = form_common.AbstractField.extend({
         return str;
     },
 
-    /* Display generic info about follower, for people not having access to res_partner */
+    /** Read on res.partner failed: only display the number of followers */
     display_generic: function () {
-        this.$('.o_followers_list').empty();
+        this.$('.o_followers_actions').hide();
+        this.$('.o_followers_list').hide();
+        this.$('.o_followers_title_box > button').prop('disabled', true);
         this.$('.o_followers_count').html(this._format_followers(this.value.length));
     },
 
diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js
index c21e709dccf..b1167eccdaa 100644
--- a/addons/mail/static/src/js/client_action.js
+++ b/addons/mail/static/src/js/client_action.js
@@ -211,7 +211,7 @@ var ChatAction = Widget.extend(ControlPanelMixin, {
             self.$('.o_mail_chat_sidebar').slideToggle(200);
         });
         this.$buttons.on('click', '.o_mail_chat_button_mark_read', function () {
-            chat_manager.mark_all_as_read();
+            chat_manager.mark_all_as_read(self.channel, self.domain);
         });
         this.$buttons.on('click', '.o_mail_chat_button_unstar_all', chat_manager.unstar_all);
 
diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js
index 6ffd2bc63c3..4fafe8427eb 100644
--- a/addons/mail/static/src/js/composer.js
+++ b/addons/mail/static/src/js/composer.js
@@ -27,6 +27,8 @@ var accented_letters_mapping = {
     ' ': '[()\\[\\]]',
 };
 
+var NON_BREAKING_SPACE = '\u00a0';
+
 var MENTION_PARTNER_DELIMITER = '@';
 var MENTION_CHANNEL_DELIMITER = '#';
 
@@ -71,6 +73,8 @@ var MentionManager = Widget.extend({
         var selected_suggestion = _.find(_.flatten(this.get('mention_suggestions')), function (s) {
             return s.id === id;
         });
+        // replace white spaces with non-breaking spaces to facilitate mentions detection in text
+        selected_suggestion.name = selected_suggestion.name.replace(/ /g, NON_BREAKING_SPACE);
         var get_mention_index = function (matches, cursor_position) {
             for (var i=0; i<matches.length; i++) {
                 if (cursor_position <= matches[i].index) {
@@ -121,9 +125,16 @@ var MentionManager = Widget.extend({
         return this.open;
     },
 
+    /**
+     * Returns the mentions of the given listener that haven't been erased from the composer's input
+     */
     get_listener_selection: function (delimiter) {
         var listener = _.findWhere(this.listeners, {delimiter: delimiter});
-        return listener ? listener.selection : [];
+        if (listener) {
+            var input_mentions = this.composer.$input.val().match(new RegExp(delimiter+'[^ ]+', 'g'));
+            return this._validate_selection(listener.selection, input_mentions);
+        }
+        return [];
     },
 
     get_listener_selections: function () {
@@ -200,33 +211,6 @@ var MentionManager = Widget.extend({
     },
 
     /**
-     * Checks if a listener's selection should be updated after DELETE or BACKSPACE keypress
-     */
-    check_remove: function () {
-        var self = this;
-        var to_remove = [];
-        var selection = this._get_selection_positions();
-        var deleted_binf = selection.start;
-        var deleted_bsup = selection.end;
-
-        _.each(this.listeners, function (listener) {
-            var mention_selection = listener.selection;
-            var matches = self._get_match(self.composer.$input.val(), listener);
-            for (var i=0; i<matches.length; i++) {
-                var m = matches[i];
-                var m1 = m.index;
-                var m2 = m.index + m[0].length;
-                if (deleted_binf <= m2 && m1 < deleted_bsup) {
-                    to_remove.push(mention_selection[i]);
-                }
-            }
-            if (to_remove.length) {
-                listener.selection = _.difference(mention_selection, to_remove);
-            }
-        });
-    },
-
-    /**
      * Replaces mentions appearing in the string 's' by html links with proper redirection
      */
     generate_links: function (s) {
@@ -242,7 +226,8 @@ var MentionManager = Widget.extend({
                 for (var i=0; i<matches.length; i++) {
                     var match = matches[i];
                     var end_index = match.index + match[0].length;
-                    var match_name = match[0].substring(1);
+                    // put back white spaces instead of non-breaking spaces in mention's name
+                    var match_name = match[0].substring(1).replace(new RegExp(NON_BREAKING_SPACE, 'g'), ' ');
                     var href = base_href + _.str.sprintf("#model=%s&id=%s", listener.model, selection[i].id);
                     var processed_text = _.str.sprintf(mention_link, href, listener.redirect_classname, selection[i].id, listener.model, listener.delimiter, match_name);
                     var subtext = s.substring(start_index, end_index).replace(match[0], processed_text);
@@ -303,6 +288,16 @@ var MentionManager = Widget.extend({
             this.open = false;
         }
     },
+    _validate_selection: function (selection, input_mentions) {
+        var validated_selection = [];
+        _.each(input_mentions, function (mention) {
+            var validated_mention = _.findWhere(selection, {name: mention.slice(1)});
+            if (validated_mention) {
+                validated_selection.push(validated_mention);
+            }
+        });
+        return validated_selection;
+    },
 
     // Cursor position and selection utils
     _get_selection_positions: function () {
@@ -477,11 +472,6 @@ var BasicComposer = Widget.extend({
                     event.preventDefault();
                 }
                 break;
-            // BACKSPACE, DELETE: check if need to remove a mention
-            case $.ui.keyCode.BACKSPACE:
-            case $.ui.keyCode.DELETE:
-                this.mention_manager.check_remove();
-                break;
             // ENTER: submit the message only if the dropdown mention proposition is not displayed
             case $.ui.keyCode.ENTER:
                 if (this.mention_manager.is_open()) {