upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Fix test for tooltip and local share owner

Browse source 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
This commit is contained in:
Jan-Christoph Borchardt 2017-11-01 11:41:22 +01:00
parent a57161f1e7
commit 9407f6c1d0
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files/css/files.scss
View file

@ -598,6 +598,10 @@ a.action > img {
margin-left: 6px;
}
#fileList .remoteAddress .userDomain {
margin-left: 0 !important;
}
#fileList .favorite-mark.permanent {
opacity: 1;
}

5
core/js/share.js
View file

@ -301,16 +301,15 @@ OC.Share = _.extend(OC.Share || {}, {
message = t('core', 'Shared by ');
avatars = this._formatRemoteShare(owner, message);
} else if (recipients) {
avatars = this._formatShareList(recipients.split(", ")).join("");
avatars = this._formatShareList(recipients.split(', ')).join('');
}
action.html(avatars).prepend(icon);
if (owner || recipients) {
var avatarElement = action.find('.avatar');
avatarElement.avatar(avatarElement.data('username'), 32);
avatarElement.tooltip({placement: 'top'});
action.find('.remoteAddress').tooltip({placement: 'top'});
action.find('.icon-shared + span').tooltip({placement: 'top'});
}
} else {
action.html('<span class="hidden-visually">' + t('core', 'Shared') + '</span>').prepend(icon);

5
core/js/tests/specs/shareSpec.js
View file

@ -58,8 +58,8 @@ describe('OC.Share tests', function() {
tooltipStub.reset();
}
it('displays the local share owner as is', function() {
checkOwner('User One', 'User One', null);
it('displays the local share owner with "Shared by" prefix', function() {
checkOwner('User One', 'Shared by User One', null);
});
it('displays the user name part of a remote share owner', function() {
checkOwner(
@ -240,4 +240,3 @@ describe('OC.Share tests', function() {
});
});
});