From b082278f0404efc65b72d7cf0516d2de52f1393b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
<skjnldsv@protonmail.com>
Date: Wed, 15 Aug 2018 09:39:12 +0200
Subject: [PATCH] Do not show action menu if no actions are available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
apps/files/js/fileactions.js | 8 +++++++-
apps/files_sharing/js/share.js | 8 +++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 3623663ed6c..ac3afba038d 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -558,7 +558,13 @@
}
});
- this._renderMenuTrigger($tr, context);
+ var menuActions = Object.values(this.actions.all).filter(function (action) {
+ return action.type !== OCA.Files.FileActions.TYPE_INLINE;
+ });
+ // do not render the menu if nothing is in it
+ if (menuActions.length > 0) {
+ this._renderMenuTrigger($tr, context);
+ }
if (triggerEvent){
fileList.$fileList.trigger(jQuery.Event("fileActionsReady", {fileList: fileList, $files: $tr}));
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 0f8dc58a85e..68529fd882f 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -42,14 +42,16 @@
var fileActions = fileList.fileActions;
var oldCreateRow = fileList._createRow;
fileList._createRow = function(fileData) {
+
+ var tr = oldCreateRow.apply(this, arguments);
+ var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData);
if (fileData.permissions === 0) {
// no permission, disabling sidebar
+ delete fileActions.actions.all.Comment;
delete fileActions.actions.all.Details;
+ delete fileActions.actions.all.Goto;
}
-
- var tr = oldCreateRow.apply(this, arguments);
- var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData);
tr.attr('data-share-permissions', sharePermissions);
if (fileData.shareOwner) {
tr.attr('data-share-owner', fileData.shareOwner);
--
GitLab