diff options
| -rw-r--r-- | apps/files/js/fileactions.js | 20 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 30 | ||||
| -rw-r--r-- | core/js/share/sharedialoglinkshareview_popover_menu.handlebars | 2 | ||||
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 2 |
4 files changed, 41 insertions, 13 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 5af558d77ba..10fedc88288 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -362,15 +362,17 @@ // remove previous $tr.find('.action-menu').remove(); - var $el = this._renderInlineAction({ - name: 'menu', - displayName: '', - iconClass: 'icon-more', - altText: t('files', 'Actions'), - action: this._showMenuClosure - }, false, context); - - $el.addClass('permanent'); + 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'); + } }, /** diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index c7169b3ce12..812da7ca5cb 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -50,6 +50,8 @@ OCA.Sharing.PublicApp = { this.initialDir = $('#dir').val(); var token = $('#sharingToken').val(); + var hideDownload = $('#hideDownload').val(); + // file list mode ? if ($el.find('#filestable').length) { @@ -92,6 +94,9 @@ OCA.Sharing.PublicApp = { ] } ); + if (hideDownload === 'true') { + this.fileList._allowSelection = false; + } this.files = OCA.Files.Files; this.files.initialize(); // TODO: move to PublicFileList.initialize() once @@ -192,6 +197,27 @@ OCA.Sharing.PublicApp = { return OC.generateUrl('/s/' + token + '/download') + '?' + OC.buildQueryString(params); }; + this.fileList._createRow = function(fileData) { + var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments); + if (hideDownload === 'true') { + this.fileActions.currentFile = $tr.find('td'); + var mime = this.fileActions.getCurrentMimeType(); + var type = this.fileActions.getCurrentType(); + var permissions = this.fileActions.getCurrentPermissions(); + var action = this.fileActions.getDefault(mime, type, permissions); + if (action) { + // remove link href if there is a default action configured (disables downloading when trying to open in a new tab) + $tr.find('a.name').attr('href', '#'); + } + delete this.fileActions.actions.all.Download; + } + return $tr; + }; + + this.fileList.isSelectedDownloadable = function () { + return hideDownload !== 'true'; + }; + this.fileList.getUploadUrl = function(fileName, dir) { if (_.isUndefined(dir)) { dir = this.getCurrentDirectory(); @@ -270,6 +296,10 @@ OCA.Sharing.PublicApp = { e.preventDefault(); OC.redirect(FileList.getDownloadUrl()); }); + + if (hideDownload === 'true') { + this.fileList.$el.find('#headerSelection').remove(); + } } $(document).on('click', '#directLink', function () { diff --git a/core/js/share/sharedialoglinkshareview_popover_menu.handlebars b/core/js/share/sharedialoglinkshareview_popover_menu.handlebars index 3f47f62d68a..9c715c7f4ee 100644 --- a/core/js/share/sharedialoglinkshareview_popover_menu.handlebars +++ b/core/js/share/sharedialoglinkshareview_popover_menu.handlebars @@ -37,7 +37,6 @@ </span> </li> {{/if}} - {{#if showHideDownloadCheckbox}} <li> <span class="menuitem"> <span class="icon-loading-small hidden"></span> @@ -46,7 +45,6 @@ <label for="sharingDialogHideDownload-{{cid}}">{{hideDownloadLabel}}</label> </span> </li> - {{/if}} {{#if showPasswordCheckBox}} <li> <span class="menuitem"> diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index a28b05aa75a..989c10c2c57 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -868,7 +868,6 @@ var isTalkEnabled = oc_appswebroots['spreed'] !== undefined; var sendPasswordByTalk = share.sendPasswordByTalk; - var showHideDownloadCheckbox = !this.model.isFolder(); var hideDownload = share.hideDownload; var maxDate = null; @@ -905,7 +904,6 @@ shareNote: share.note, hasNote: share.note !== '', maxDate: maxDate, - showHideDownloadCheckbox: showHideDownloadCheckbox, hideDownload: hideDownload, isExpirationEnforced: isExpirationEnforced, } |