|
|
|
@ -156,9 +156,11 @@ define([
|
|
|
|
|
|
|
|
|
|
|
|
var icons = Object.keys(users).map(function (key, i) {
|
|
|
|
var icons = Object.keys(users).map(function (key, i) {
|
|
|
|
var data = users[key];
|
|
|
|
var data = users[key];
|
|
|
|
var name = data.displayName || data.name || Messages.anonymous;
|
|
|
|
var name = UI.getDisplayName(data.displayName || data.name);
|
|
|
|
var avatar = h('span.cp-usergrid-avatar.cp-avatar');
|
|
|
|
var avatar = h('span.cp-usergrid-avatar.cp-avatar', {
|
|
|
|
common.displayAvatar($(avatar), data.avatar, name);
|
|
|
|
'aria-hidden': true, // XXX aria
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
common.displayAvatar($(avatar), data.avatar, name, Util.noop, data.uid);
|
|
|
|
var removeBtn, el;
|
|
|
|
var removeBtn, el;
|
|
|
|
if (config.remove) {
|
|
|
|
if (config.remove) {
|
|
|
|
removeBtn = h('span.fa.fa-times');
|
|
|
|
removeBtn = h('span.fa.fa-times');
|
|
|
|
@ -1989,13 +1991,16 @@ define([
|
|
|
|
|
|
|
|
|
|
|
|
var $displayName = $userAdmin.find('.'+displayNameCls);
|
|
|
|
var $displayName = $userAdmin.find('.'+displayNameCls);
|
|
|
|
|
|
|
|
|
|
|
|
var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
|
|
|
|
var $avatar = $userAdmin.find('> button .cp-dropdown-button-title'); // XXX alt="User menu"
|
|
|
|
var loadingAvatar;
|
|
|
|
var loadingAvatar;
|
|
|
|
var to;
|
|
|
|
var to;
|
|
|
|
var oldUrl = '';
|
|
|
|
var oldUrl = '';
|
|
|
|
|
|
|
|
var oldUid;
|
|
|
|
|
|
|
|
var oldName;
|
|
|
|
var updateButton = function () {
|
|
|
|
var updateButton = function () {
|
|
|
|
var myData = metadataMgr.getUserData();
|
|
|
|
var myData = metadataMgr.getUserData();
|
|
|
|
var privateData = metadataMgr.getPrivateData();
|
|
|
|
var privateData = metadataMgr.getPrivateData();
|
|
|
|
|
|
|
|
var uid = myData.uid;
|
|
|
|
if (!priv.plan && privateData.plan) {
|
|
|
|
if (!priv.plan && privateData.plan) {
|
|
|
|
config.$initBlock.empty();
|
|
|
|
config.$initBlock.empty();
|
|
|
|
metadataMgr.off('change', updateButton);
|
|
|
|
metadataMgr.off('change', updateButton);
|
|
|
|
@ -2010,18 +2015,21 @@ define([
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
loadingAvatar = true;
|
|
|
|
loadingAvatar = true;
|
|
|
|
var newName = myData.name;
|
|
|
|
var newName = UI.getDisplayName(myData.name);
|
|
|
|
var url = myData.avatar;
|
|
|
|
var url = myData.avatar;
|
|
|
|
$displayName.text(newName || Messages.anonymous);
|
|
|
|
$displayName.text(newName);
|
|
|
|
if (accountName && oldUrl !== url) {
|
|
|
|
if ((accountName && oldUrl !== url) || !accountName && uid !== oldUid || oldName !== newName) {
|
|
|
|
$avatar.html('');
|
|
|
|
$avatar.html('');
|
|
|
|
Common.displayAvatar($avatar, url,
|
|
|
|
Common.displayAvatar($avatar, url, newName, function ($img) {
|
|
|
|
newName || Messages.anonymous, function ($img) {
|
|
|
|
|
|
|
|
oldUrl = url;
|
|
|
|
oldUrl = url;
|
|
|
|
|
|
|
|
oldUid = uid;
|
|
|
|
|
|
|
|
oldName = newName;
|
|
|
|
$userAdmin.find('> button').removeClass('cp-avatar');
|
|
|
|
$userAdmin.find('> button').removeClass('cp-avatar');
|
|
|
|
if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
|
|
|
|
if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
|
|
|
|
loadingAvatar = false;
|
|
|
|
loadingAvatar = false;
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// XXX alt="User menu"
|
|
|
|
|
|
|
|
}, uid);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
loadingAvatar = false;
|
|
|
|
loadingAvatar = false;
|
|
|
|
@ -2303,6 +2311,7 @@ define([
|
|
|
|
var teams = Object.keys(privateData.teams).map(function (id) {
|
|
|
|
var teams = Object.keys(privateData.teams).map(function (id) {
|
|
|
|
var data = privateData.teams[id];
|
|
|
|
var data = privateData.teams[id];
|
|
|
|
var avatar = h('span.cp-creation-team-avatar.cp-avatar');
|
|
|
|
var avatar = h('span.cp-creation-team-avatar.cp-avatar');
|
|
|
|
|
|
|
|
// We assume that teams always have a non-empty name, so we don't need a UID
|
|
|
|
common.displayAvatar($(avatar), data.avatar, data.name);
|
|
|
|
common.displayAvatar($(avatar), data.avatar, data.name);
|
|
|
|
return h('div.cp-creation-team', {
|
|
|
|
return h('div.cp-creation-team', {
|
|
|
|
'data-id': id,
|
|
|
|
'data-id': id,
|
|
|
|
@ -3106,7 +3115,7 @@ define([
|
|
|
|
var sframeChan = common.getSframeChannel();
|
|
|
|
var sframeChan = common.getSframeChannel();
|
|
|
|
var msg = data.content.msg;
|
|
|
|
var msg = data.content.msg;
|
|
|
|
|
|
|
|
|
|
|
|
var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
|
|
|
|
var name = Util.fixHTML(UI.getDisplayName(msg.content.user.displayName));
|
|
|
|
var title = Util.fixHTML(msg.content.title);
|
|
|
|
var title = Util.fixHTML(msg.content.title);
|
|
|
|
|
|
|
|
|
|
|
|
var text = Messages._getKey('owner_add', [name, title]);
|
|
|
|
var text = Messages._getKey('owner_add', [name, title]);
|
|
|
|
@ -3238,7 +3247,7 @@ define([
|
|
|
|
var sframeChan = common.getSframeChannel();
|
|
|
|
var sframeChan = common.getSframeChannel();
|
|
|
|
var msg = data.content.msg;
|
|
|
|
var msg = data.content.msg;
|
|
|
|
|
|
|
|
|
|
|
|
var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
|
|
|
|
var name = Util.fixHTML(UI.getDisplayName(msg.content.user.displayName));
|
|
|
|
var title = Util.fixHTML(msg.content.title);
|
|
|
|
var title = Util.fixHTML(msg.content.title);
|
|
|
|
|
|
|
|
|
|
|
|
var text = Messages._getKey('owner_team_add', [name, title]);
|
|
|
|
var text = Messages._getKey('owner_team_add', [name, title]);
|
|
|
|
@ -3353,13 +3362,15 @@ define([
|
|
|
|
var verified = h('p');
|
|
|
|
var verified = h('p');
|
|
|
|
var $verified = $(verified);
|
|
|
|
var $verified = $(verified);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
name = UI.getDisplayName(name);
|
|
|
|
if (priv.friends && priv.friends[curve]) {
|
|
|
|
if (priv.friends && priv.friends[curve]) {
|
|
|
|
$verified.addClass('cp-notifications-requestedit-verified');
|
|
|
|
$verified.addClass('cp-notifications-requestedit-verified');
|
|
|
|
var f = priv.friends[curve];
|
|
|
|
var f = priv.friends[curve];
|
|
|
|
$verified.append(h('span.fa.fa-certificate'));
|
|
|
|
$verified.append(h('span.fa.fa-certificate'));
|
|
|
|
var $avatar = $(h('span.cp-avatar')).appendTo($verified);
|
|
|
|
var $avatar = $(h('span.cp-avatar')).appendTo($verified);
|
|
|
|
$verified.append(h('p', Messages._getKey('isContact', [f.displayName])));
|
|
|
|
name = UI.getDisplayName(f.displayName);
|
|
|
|
common.displayAvatar($avatar, f.avatar, f.displayName);
|
|
|
|
$verified.append(h('p', Messages._getKey('isContact', [name])));
|
|
|
|
|
|
|
|
common.displayAvatar($avatar, f.avatar, name, Util.noop, f.uid);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
$verified.append(Messages._getKey('isNotContact', [name]));
|
|
|
|
$verified.append(Messages._getKey('isNotContact', [name]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -3369,7 +3380,7 @@ define([
|
|
|
|
UIElements.displayInviteTeamModal = function (common, data) {
|
|
|
|
UIElements.displayInviteTeamModal = function (common, data) {
|
|
|
|
var msg = data.content.msg;
|
|
|
|
var msg = data.content.msg;
|
|
|
|
|
|
|
|
|
|
|
|
var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
|
|
|
|
var name = Util.fixHTML(UI.getDisplayName(msg.content.user.displayName));
|
|
|
|
var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
|
|
|
|
var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
|
|
|
|
|
|
|
|
|
|
|
|
var verified = UIElements.getVerifiedFriend(common, msg.author, name);
|
|
|
|
var verified = UIElements.getVerifiedFriend(common, msg.author, name);
|
|
|
|
@ -3453,7 +3464,8 @@ define([
|
|
|
|
name: f.displayName,
|
|
|
|
name: f.displayName,
|
|
|
|
curvePublic: f.curvePublic,
|
|
|
|
curvePublic: f.curvePublic,
|
|
|
|
profile: f.profile,
|
|
|
|
profile: f.profile,
|
|
|
|
notifications: f.notifications
|
|
|
|
notifications: f.notifications,
|
|
|
|
|
|
|
|
uid: f.uid,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
};
|
|
|
|
@ -3552,7 +3564,7 @@ define([
|
|
|
|
};
|
|
|
|
};
|
|
|
|
// Set the value to receive from the autocomplete
|
|
|
|
// Set the value to receive from the autocomplete
|
|
|
|
var toInsert = function (data, key) {
|
|
|
|
var toInsert = function (data, key) {
|
|
|
|
var name = data.name.replace(/[^a-zA-Z0-9]+/g, "-");
|
|
|
|
var name = UI.getDisplayName(data.name.replace(/[^a-zA-Z0-9]+/g, "-"));
|
|
|
|
return "[@"+name+"|"+key+"]";
|
|
|
|
return "[@"+name+"|"+key+"]";
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
@ -3605,18 +3617,20 @@ define([
|
|
|
|
var avatar = h('span.cp-avatar', {
|
|
|
|
var avatar = h('span.cp-avatar', {
|
|
|
|
contenteditable: false
|
|
|
|
contenteditable: false
|
|
|
|
});
|
|
|
|
});
|
|
|
|
common.displayAvatar($(avatar), data.avatar, data.name);
|
|
|
|
|
|
|
|
|
|
|
|
var displayName = UI.getDisplayName(data.name);
|
|
|
|
|
|
|
|
common.displayAvatar($(avatar), data.avatar, displayName); // XXX
|
|
|
|
return h('span.cp-mentions', {
|
|
|
|
return h('span.cp-mentions', {
|
|
|
|
'data-curve': data.curvePublic,
|
|
|
|
'data-curve': data.curvePublic,
|
|
|
|
'data-notifications': data.notifications,
|
|
|
|
'data-notifications': data.notifications,
|
|
|
|
'data-profile': data.profile,
|
|
|
|
'data-profile': data.profile,
|
|
|
|
'data-name': Util.fixHTML(data.name),
|
|
|
|
'data-name': Util.fixHTML(displayName),
|
|
|
|
'data-avatar': data.avatar || "",
|
|
|
|
'data-avatar': data.avatar || "",
|
|
|
|
}, [
|
|
|
|
}, [
|
|
|
|
avatar,
|
|
|
|
avatar,
|
|
|
|
h('span.cp-mentions-name', {
|
|
|
|
h('span.cp-mentions-name', {
|
|
|
|
contenteditable: false
|
|
|
|
contenteditable: false
|
|
|
|
}, data.name)
|
|
|
|
}, displayName)
|
|
|
|
]);
|
|
|
|
]);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -3648,7 +3662,7 @@ define([
|
|
|
|
}).map(function (key) {
|
|
|
|
}).map(function (key) {
|
|
|
|
var data = sources[key];
|
|
|
|
var data = sources[key];
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
label: data.name,
|
|
|
|
label: UI.getDisplayName(data.name),
|
|
|
|
value: key
|
|
|
|
value: key
|
|
|
|
};
|
|
|
|
};
|
|
|
|
});
|
|
|
|
});
|
|
|
|
@ -3683,10 +3697,12 @@ define([
|
|
|
|
var obj = sources[key];
|
|
|
|
var obj = sources[key];
|
|
|
|
if (!obj) { return; }
|
|
|
|
if (!obj) { return; }
|
|
|
|
var avatar = h('span.cp-avatar');
|
|
|
|
var avatar = h('span.cp-avatar');
|
|
|
|
common.displayAvatar($(avatar), obj.avatar, obj.name);
|
|
|
|
var displayName = UI.getDisplayName(obj.name);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
common.displayAvatar($(avatar), obj.avatar, displayName, Util.noop, obj.uid);
|
|
|
|
var li = h('li.cp-autocomplete-value', [
|
|
|
|
var li = h('li.cp-autocomplete-value', [
|
|
|
|
avatar,
|
|
|
|
avatar,
|
|
|
|
h('span', obj.name)
|
|
|
|
h('span', displayName),
|
|
|
|
]);
|
|
|
|
]);
|
|
|
|
return $(li).appendTo(ul);
|
|
|
|
return $(li).appendTo(ul);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
ansuz
4 years ago