diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-11-20 12:20:06 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-11-20 19:46:49 +0100 |
| commit | 78056a3bef15c04af19b256915415f413cb561f2 (patch) | |
| tree | 468aad968ed5cc9e4127f35ec0f6a2cb187f8c99 | |
| parent | fc99811d0a4935eda1c7ea3d94ae1b50b8cc4b8c (diff) | |
| download | nextcloud-server-78056a3bef15c04af19b256915415f413cb561f2.tar.gz nextcloud-server-78056a3bef15c04af19b256915415f413cb561f2.zip | |
Fix whitespace and file action cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | apps/files/js/fileactions.js | 21 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 3 | ||||
| -rw-r--r-- | core/js/tests/specs/sharedialoglinkshareview.js | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 10fedc88288..2981fb64c11 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -362,17 +362,16 @@ // remove previous $tr.find('.action-menu').remove(); - if (this.actions.length > 0) { - var $el = this._renderInlineAction({ - name: 'menu', - displayName: '', - iconClass: 'icon-more', - altText: t('files', 'Actions'), - action: this._showMenuClosure - }, false, context); - - $el.addClass('permanent'); - } + var $el = this._renderInlineAction({ + name: 'menu', + displayName: '', + iconClass: 'icon-more', + altText: t('files', 'Actions'), + action: this._showMenuClosure + }, false, context); + + $el.addClass('permanent'); + }, /** diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 57001c495d3..d339ae1dcb4 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -209,7 +209,7 @@ OCA.Sharing.PublicApp = { // Remove the link. This means that files without a default action fail hard $tr.find('a.name').attr('href', '#'); - delete this.fileActions.actions.all.Download; + this.fileActions.actions.all = {}; } return $tr; }; @@ -299,6 +299,7 @@ OCA.Sharing.PublicApp = { if (hideDownload === 'true') { this.fileList.$el.find('#headerSelection').remove(); + this.fileList.$el.find('.summary').find('td:first-child').remove(); } } diff --git a/core/js/tests/specs/sharedialoglinkshareview.js b/core/js/tests/specs/sharedialoglinkshareview.js index 0272b07297e..9e6c67dca14 100644 --- a/core/js/tests/specs/sharedialoglinkshareview.js +++ b/core/js/tests/specs/sharedialoglinkshareview.js @@ -114,7 +114,7 @@ describe('OC.Share.ShareDialogLinkShareView', function () { $hideDownloadCheckbox = view.$el.find('.hideDownloadCheckbox'); - expect($hideDownloadCheckbox.length).toBeFalsy(); + expect($hideDownloadCheckbox.length).toBeTruthy(); }); it('checkbox is checked when the setting is enabled', function () { |