Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/common/common-messenger.js

@@ -962,7 +962,7 @@ define([
                 cb({error:err});
             });
             channel.messages = [];
-        }
+        };
 
         network.on('disconnect', function () {
             emit('DISCONNECT');

www/common/messenger-ui.js

@@ -617,8 +617,10 @@ define([
         };
         var onLeave = function (obj) {
             var channel = obj.id;
+            var chan = state.channels[channel];
             var data = obj.info;
-            if (contactsData[data.curvePublic]) {
+            // XXX Teams: if someone leaves a room, don't remove their data if they're also a friend
+            if (contactsData[data.curvePublic] && !(chan && chan.isFriendChat)) {
                 delete contactsData[data.curvePublic];
             }
             updateStatus(channel);

www/common/sframe-common-mailbox.js

@@ -52,7 +52,7 @@ define([
             var dismissIcon = h('span.fa.fa-times');
             var dismiss = h('div.cp-notification-dismiss', {
                 title: Messages.notifications_dismiss
-            }, dismissIcon)
+            }, dismissIcon);
             dismiss.addEventListener('click', function (e) {
                 e.preventDefault();
                 e.stopPropagation();