diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-11-01 11:41:22 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-11-01 11:41:22 +0100 |
| commit | 9407f6c1d08b95bbbd751c372c0e571b1e2e1c15 (patch) | |
| tree | cfdd35d6e2911f2646c64b4b7fc46b0b07ed675f | |
| parent | a57161f1e73a1238cf7ffa0ac39e5b6be54f105f (diff) | |
| download | nextcloud-server-9407f6c1d08b95bbbd751c372c0e571b1e2e1c15.tar.gz nextcloud-server-9407f6c1d08b95bbbd751c372c0e571b1e2e1c15.zip | |
Fix test for tooltip and local share owner
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| -rw-r--r-- | apps/files/css/files.scss | 4 | ||||
| -rw-r--r-- | core/js/share.js | 5 | ||||
| -rw-r--r-- | core/js/tests/specs/shareSpec.js | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 80a95559b2c..c165063bb85 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -598,6 +598,10 @@ a.action > img { margin-left: 6px; } +#fileList .remoteAddress .userDomain { + margin-left: 0 !important; +} + #fileList .favorite-mark.permanent { opacity: 1; } diff --git a/core/js/share.js b/core/js/share.js index 240fc0fb761..c629fb01da4 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -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); diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js index fbf6eecc8df..cef0d57fc6a 100644 --- a/core/js/tests/specs/shareSpec.js +++ b/core/js/tests/specs/shareSpec.js @@ -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() { }); }); }); - |