Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Move Create new album action out of menu #2794

Merged
merged 3 commits into from
Feb 5, 2025
Merged

chore: Move Create new album action out of menu #2794

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0004f4c
chore: Move Create new album action out of menu
Pytal Feb 3, 2025
6233eb8
chore(assets): Recompile assets
nextcloud-command Feb 3, 2025
7d9da1f
test: Adapt tests
Pytal Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/photos-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-public.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-public.js.map
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 8 additions & 15 deletions src/views/Timeline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,15 @@
@refresh="resetFetchFilesState">
<div class="timeline__header__left">
<!-- TODO: UploadPicker -->
<NcActions v-if="selectedFileIds.length === 0"
ref="addActions"
:force-menu="true"
:menu-name="t('photos', 'Add')">
<NcButton v-if="selectedFileIds.length === 0"
ref="newAlbumButton"
:aria-label="t('photos', 'Create new album')"
@click="showAlbumCreationForm = true">
{{ t('photos', 'Create new album') }}
<template #icon>
<Plus />
<PlusBoxMultiple />
</template>
<NcActionButton :close-after-click="true"
:aria-label="t('photos', 'Create new album')"
@click="showAlbumCreationForm = true">
{{ t('photos', 'Create new album') }}
<template #icon>
<PlusBoxMultiple />
</template>
</NcActionButton>
</NcActions>
</NcButton>

<template v-else>
<NcButton :close-after-click="true"
Expand Down Expand Up @@ -114,7 +107,7 @@

<NcModal v-if="showAlbumCreationForm"
key="albumCreationForm"
:set-return-focus="$refs.addActions?.$refs.menuButton?.$el"
:set-return-focus="$refs.newAlbumButton?.$el"
@close="showAlbumCreationForm = false">
<h2 class="timeline__heading">
{{ t('photos', 'New album') }}
Expand Down
Loading