Client:Components:Article:MainButton Fix after merge
This commit is contained in:
parent
0623e57d9e
commit
47f976c76a
@ -529,6 +529,29 @@ const ArticleMainButtonContent = (props) => {
|
||||
key: "pptx",
|
||||
};
|
||||
|
||||
const uploadActions = [
|
||||
{
|
||||
id: "actions_upload-files",
|
||||
className: "main-button_drop-down",
|
||||
icon: ActionsUploadReactSvgUrl,
|
||||
label: t("UploadFiles"),
|
||||
onClick: onUploadFileClick,
|
||||
key: "upload-files",
|
||||
},
|
||||
];
|
||||
|
||||
if (isDesktop()) {
|
||||
uploadActions.push({
|
||||
id: "actions_upload-folders",
|
||||
className: "main-button_drop-down",
|
||||
icon: ActionsUploadReactSvgUrl,
|
||||
label: t("UploadFolder"),
|
||||
disabled: isPrivacy,
|
||||
onClick: onUploadFolderClick,
|
||||
key: "upload-folder",
|
||||
});
|
||||
}
|
||||
|
||||
if (
|
||||
currentRoomType === RoomsType.FormRoom ||
|
||||
(parentRoomType === FolderType.FormRoom && isFolder)
|
||||
@ -657,29 +680,6 @@ const ArticleMainButtonContent = (props) => {
|
||||
createNewFolder,
|
||||
];
|
||||
|
||||
const uploadActions = [
|
||||
{
|
||||
id: "actions_upload-files",
|
||||
className: "main-button_drop-down",
|
||||
icon: ActionsUploadReactSvgUrl,
|
||||
label: t("UploadFiles"),
|
||||
onClick: onUploadFileClick,
|
||||
key: "upload-files",
|
||||
},
|
||||
];
|
||||
|
||||
if (isDesktop()) {
|
||||
uploadActions.push({
|
||||
id: "actions_upload-folders",
|
||||
className: "main-button_drop-down",
|
||||
icon: ActionsUploadReactSvgUrl,
|
||||
label: t("UploadFolder"),
|
||||
disabled: isPrivacy,
|
||||
onClick: onUploadFolderClick,
|
||||
key: "upload-folder",
|
||||
});
|
||||
}
|
||||
|
||||
if (pluginItems.length > 0) {
|
||||
// menuModel.push({
|
||||
// id: "actions_more-plugins",
|
||||
|
Loading…
Reference in New Issue
Block a user