diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-08-24 22:21:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 22:21:55 +0200 |
| commit | 8761856a7156474257f0f17949f1379804b2c627 (patch) | |
| tree | a93dd9c84e6c5c0592c54aafc4dd28ff5aa7e95a /core/js | |
| parent | ac932309a232afc2e08fe167aa1611e98951e86c (diff) | |
| parent | 13230f180a897cd56489102c6e91d39fb8e1e2f3 (diff) | |
| download | nextcloud-server-8761856a7156474257f0f17949f1379804b2c627.tar.gz nextcloud-server-8761856a7156474257f0f17949f1379804b2c627.zip | |
Merge pull request #10838 from nextcloud/header-fixes-and-public-note
Header fixes and public note
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 2 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/sharedialogviewSpec.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js index a4de1c3dbf6..8e7796143d5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1571,7 +1571,7 @@ function initCore() { var resizeMenu = function() { var appList = $('#appmenu li'); - var headerWidth = $('.header-left').width() - $('#nextcloud').width(); + var headerWidth = $('.header-left').outerWidth() - $('#nextcloud').outerWidth(); var usePercentualAppMenuLimit = 0.33; var minAppsDesktop = 8; var availableWidth = headerWidth - $(appList).width(); diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 90da279bdb9..da4d887634a 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -25,8 +25,8 @@ ' <span class="shareWithConfirm icon icon-confirm"></span>' + '</div>' + '{{/if}}' + - '<div class="shareeListView subView"></div>' + '<div class="linkShareView subView"></div>' + + '<div class="shareeListView subView"></div>' + '<div class="loading hidden" style="height: 50px"></div>'; /** diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js index 33d3be51440..20504c56b67 100644 --- a/core/js/tests/specs/sharedialogviewSpec.js +++ b/core/js/tests/specs/sharedialogviewSpec.js @@ -303,7 +303,7 @@ describe('OC.Share.ShareDialogView', function() { }); it('test avatar for circle', function() { - var avatarElement = dialog.$('.avatar').eq(4); + var avatarElement = dialog.$('.avatar').eq(5); expect(avatarElement.css('background')).toContain('path/to/the/avatar'); }); |