upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #35474 from nextcloud/feature/rich-workspace-visibility

Browse source 
Update rich-workspace visibility
This commit is contained in:
Julius Härtl 2023-01-31 09:54:57 +01:00 committed by GitHub
commit 9f2495cc09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/files/js/newfilemenu.js
View file

@ -81,10 +81,18 @@
if (action === 'upload') {
OC.hideMenus();
} else {
event.preventDefault();
this.$el.find('.menuitem.active').removeClass('active');
$target.addClass('active');
this._promptFileName($target);
var actionItem = _.filter(this._menuItems, function(item) {
return item.id === action
}).pop();
if (typeof actionItem.useInput === 'undefined' || actionItem.useInput === true) {
event.preventDefault();
this.$el.find('.menuitem.active').removeClass('active');
$target.addClass('active');
this._promptFileName($target);
} else {
actionItem.actionHandler();
OC.hideMenus();
}
}
},
@ -198,8 +206,10 @@
templateName: actionSpec.templateName,
iconClass: actionSpec.iconClass,
fileType: actionSpec.fileType,
useInput: actionSpec.useInput,
actionHandler: actionSpec.actionHandler,
checkFilename: actionSpec.checkFilename
checkFilename: actionSpec.checkFilename,
shouldShow: actionSpec.shouldShow,
});
},
@ -220,10 +230,11 @@
* Renders the menu with the currently set items
*/
render: function() {
const menuItems = this._menuItems.filter(item => !item.shouldShow || (item.shouldShow instanceof Function && item.shouldShow() === true))
this.$el.html(this.template({
uploadMaxHumanFileSize: 'TODO',
uploadLabel: t('files', 'Upload file'),
items: this._menuItems
items: menuItems
}));
// Trigger upload action also with keyboard navigation on enter