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

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

Browse Source
This commit is contained in:
ansuz 2019-08-27 11:38:16 +02:00
commit 1241d17b43
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/common-ui-elements.js
View File

@ -357,17 +357,18 @@ define([
if (curve.length <= 40) { return; } if (curve.length <= 40) { return; }
var data = friends[curve]; var data = friends[curve];
if (!data.notifications) { return; } if (!data.notifications) { return; }
var name = data.displayName || Messages.anonymous;
var avatar = h('span.cp-share-friend-avatar.cp-avatar'); var avatar = h('span.cp-share-friend-avatar.cp-avatar');
UIElements.displayAvatar(common, $(avatar), data.avatar, data.displayName); UIElements.displayAvatar(common, $(avatar), data.avatar, name);
return h('div.cp-share-friend', { return h('div.cp-share-friend', {
'data-curve': data.curvePublic, 'data-curve': data.curvePublic,
'data-name': data.displayName, 'data-name': name,
'data-order': i, 'data-order': i,
title: data.displayName, title: name,
style: 'order:'+i+';' style: 'order:'+i+';'
},[ },[
avatar, avatar,
h('span.cp-share-friend-name', data.displayName) h('span.cp-share-friend-name', name)
]); ]);
}).filter(function (x) { return x; }); }).filter(function (x) { return x; });
var smallCurves = Object.keys(friends).map(function (c) { var smallCurves = Object.keys(friends).map(function (c) {

1
www/share/main.js
View File

@ -85,6 +85,7 @@ define([
}).nThen(function (/*waitFor*/) { }).nThen(function (/*waitFor*/) {
metaObj.doc = {}; metaObj.doc = {};
var additionalPriv = { var additionalPriv = {
fileHost: ApiConfig.fileHost,
accountName: Utils.LocalStore.getAccountName(), accountName: Utils.LocalStore.getAccountName(),
origin: window.location.origin, origin: window.location.origin,
pathname: window.location.pathname, pathname: window.location.pathname,