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

www/common/common-ui-elements.js

@@ -372,6 +372,15 @@ define([
         return $toolbar;
     };
     UIElements.createMarkdownToolbar = function (common, editor) {
+        var readOnly = common.getMetadataMgr().getPrivateData().readOnly;
+        if (readOnly) {
+            return {
+                toolbar: $(),
+                button: $(),
+                setState: function () {}
+            };
+        }
+
         var $toolbar = createMdToolbar(common, editor);
         var cfg = {
             title: Messages.mdToolbar_button,

www/common/toolbar3.js

@@ -237,7 +237,7 @@ define([
             var $rightCol = $('<span>', {'class': 'cp-toolbar-userlist-rightcol'});
             var $nameSpan = $('<span>', {'class': 'cp-toolbar-userlist-name'}).text(name).appendTo($rightCol);
             var isMe = data.uid === user.uid;
-            if (isMe) {
+            if (isMe && !priv.readOnly) {
                 $nameSpan.html('');
                 var $nameValue = $('<span>', {
                     'class': 'cp-toolbar-userlist-name-value'
@@ -292,7 +292,8 @@ define([
                                                  editingUserName.select[1]);
                     setTimeout(function () { $nameInput.focus(); });
                 }
-            } else if (Common.isLoggedIn() && data.curvePublic && !friends[data.curvePublic]) {
+            } else if (Common.isLoggedIn() && data.curvePublic && !friends[data.curvePublic]
+                && !priv.readOnly) {
                 if (pendingFriends.indexOf(data.netfluxId) !== -1) {
                     $('<span>', {'class': 'cp-toolbar-userlist-friend'}).text(Messages.userlist_pending)
                         .appendTo($rightCol);