web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' into inviteUI

Browse Source
This commit is contained in:
yflory 2019-12-18 16:23:15 +01:00
commit 563e2161c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/profile/inner.js
View File

@ -232,7 +232,7 @@ define([
// If this curve has sent us a friend request, we should not be able to sent it to them // If this curve has sent us a friend request, we should not be able to sent it to them
var friendRequests = common.getFriendRequests(); var friendRequests = common.getFriendRequests();
if (friendRequests[data.curvePublic]) { if (friendRequests[data.curvePublic]) {
$button.append(Messages._getKey('friendRequest_received', [data.name || Messages.anonymous])) $button.append(Messages._getKey('friendRequest_received', [name || Messages.anonymous]))
.click(function () { .click(function () {
UIElements.displayFriendRequestModal(common, friendRequests[data.curvePublic]); UIElements.displayFriendRequestModal(common, friendRequests[data.curvePublic]);
}); });
@ -299,7 +299,7 @@ define([
$(muteButton).click(function () { $(muteButton).click(function () {
module.execCommand('MUTE_USER', { module.execCommand('MUTE_USER', {
curvePublic: data.curvePublic, curvePublic: data.curvePublic,
name: data.displayName || data.name, name: Util.fixHTML(data.displayName || data.name),
avatar: data.avatar avatar: data.avatar
}, function (e) { }, function (e) {
if (e) { console.error(e); return void UI.warn(Messages.error); } if (e) { console.error(e); return void UI.warn(Messages.error); }