summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-08-16 08:32:19 +0200
committerGitHub <noreply@github.com>2018-08-16 08:32:19 +0200
commit2b5ec3755e9522d06215c6762c3458230abd4fe3 (patch)
tree5eb7ea0eba73356e0b4f4fe6166a4a37db30b3f6 /apps/files
parentb0af604d0eaf2816f2f1914109168631a616cdbe (diff)
parent5647f85a3cc88e8b650164d56839448abb5e0229 (diff)
downloadnextcloud-server-2b5ec3755e9522d06215c6762c3458230abd4fe3.tar.gz
nextcloud-server-2b5ec3755e9522d06215c6762c3458230abd4fe3.zip
Merge pull request #10692 from nextcloud/deleted-share-remove-actions
Do not show action menu if no actions are available
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/fileactions.js22
1 files changed, 21 insertions, 1 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 3623663ed6c..8ce8eddb0b0 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -558,7 +558,27 @@
}
});
- this._renderMenuTrigger($tr, context);
+ function objectValues(obj) {
+ var res = [];
+ for (var i in obj) {
+ if (obj.hasOwnProperty(i)) {
+ res.push(obj[i]);
+ }
+ }
+ return res;
+ }
+ // polyfill
+ if (!Object.values) {
+ Object.values = objectValues;
+ }
+
+ 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}));