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

New tooltips

Browse Source
This commit is contained in:
yflory
2017-07-19 17:14:10 +02:00
parent 88813aee02
commit c33d2a2db0
9 changed files with 84 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/toolbar2.js
View File

@@ -1,7 +1,7 @@
define([
'jquery',
'/customize/application_config.js',
'/api/config'
'/api/config',
], function ($, Config, ApiConfig) {
var Messages = {};
var Cryptpad;
@@ -206,7 +206,7 @@ define([
var pendingFriends = Cryptpad.getPendingInvites();
editUsersNames.forEach(function (data) {
var name = data.name || Messages.anonymous;
var $span = $('<span>', {'title': name, 'class': 'avatar'});
var $span = $('<span>', {'class': 'avatar'});
var $rightCol = $('<span>', {'class': 'right-col'});
var $nameSpan = $('<span>', {'class': 'name'}).text(name).appendTo($rightCol);
var proxy = Cryptpad.getProxy();
@@ -214,9 +214,10 @@ define([
if (Cryptpad.isLoggedIn() && data.curvePublic) {
if (isMe) {
$nameSpan.attr('title', Messages._getKey('userlist_thisIsYou', [
$span.attr('title', Messages._getKey('userlist_thisIsYou', [
name
])).text(name);
]));
$nameSpan.text(name);
} else if (!proxy.friends || !proxy.friends[data.curvePublic]) {
if (pendingFriends.indexOf(data.netfluxId) !== -1) {
$('<span>', {'class': 'friend'}).text(Messages.userlist_pending)