summaryrefslogtreecommitdiffstats
path: root/core/js/share.js
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-11-01 15:14:45 +0100
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-11-01 15:14:45 +0100
commit3b2c9da7ccc557651a6a47b37e2677511319fbbb (patch)
tree68b3fdfd0019f5ec54ccc406e7fc5612d5cc551f /core/js/share.js
parent9407f6c1d08b95bbbd751c372c0e571b1e2e1c15 (diff)
downloadnextcloud-server-3b2c9da7ccc557651a6a47b37e2677511319fbbb.tar.gz
nextcloud-server-3b2c9da7ccc557651a6a47b37e2677511319fbbb.zip
Adjust js tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'core/js/share.js')
-rw-r--r--core/js/share.js13
1 files changed, 6 insertions, 7 deletions
diff --git a/core/js/share.js b/core/js/share.js
index c629fb01da4..cae385f09b2 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -207,16 +207,15 @@ OC.Share = _.extend(OC.Share || {}, {
var parts = this._REMOTE_OWNER_REGEXP.exec(remoteAddress);
if (!parts) {
// display avatar of the user
- var avatar = '<span class="avatar" data-userName="' + escapeHTML(remoteAddress) + '" title="' + message + escapeHTML(remoteAddress) + '"></span>';
- var hidden = '<span class="hidden-visually">' + message + escapeHTML(remoteAddress) + '</span>';
+ var avatar = '<span class="avatar" data-userName="' + escapeHTML(remoteAddress) + '" title="' + message + " " + escapeHTML(remoteAddress) + '"></span>';
+ var hidden = '<span class="hidden-visually">' + message + " " + escapeHTML(remoteAddress) + '</span> ';
return avatar + hidden;
}
var userName = parts[1];
var userDomain = parts[3];
var server = parts[4];
- var dir = parts[6];
- var tooltip = userName;
+ var tooltip = message + " " + userName;
if (userDomain) {
tooltip += '@' + userDomain;
}
@@ -232,7 +231,7 @@ OC.Share = _.extend(OC.Share || {}, {
if (userDomain) {
html += '<span class="userDomain">@' + escapeHTML(userDomain) + '</span>';
}
- html += '</span>';
+ html += '</span> ';
return html;
},
/**
@@ -245,7 +244,7 @@ OC.Share = _.extend(OC.Share || {}, {
_formatShareList: function(recipients) {
var _parent = this;
return $.map(recipients, function(recipient) {
- recipient = _parent._formatRemoteShare(recipient, t('core', 'Shared with '));
+ recipient = _parent._formatRemoteShare(recipient, t('core', 'Shared with'));
return recipient;
});
},
@@ -298,7 +297,7 @@ OC.Share = _.extend(OC.Share || {}, {
avatars = '<span>' + t('core', 'Shared') + '</span>';
// even if reshared, only show "Shared by"
if (owner) {
- message = t('core', 'Shared by ');
+ message = t('core', 'Shared by');
avatars = this._formatRemoteShare(owner, message);
} else if (recipients) {
avatars = this._formatShareList(recipients.split(', ')).join('');