Skip to content

Commit

Permalink
Merge pull request #1326 from nextcloud/backport/1322/stable4.10
Browse files Browse the repository at this point in the history
[stable4.10] fix: Switch to vue-frag instead of vue-fragment to avoid errors during delete
  • Loading branch information
juliushaertl committed Jul 17, 2024
2 parents b1d5496 + 3a3d893 commit 7d796c1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
11 changes: 2 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"markdown-it-bidi": "^0.1.0",
"markdown-it-task-checkbox": "^1.0.6",
"vue": "^2.7.16",
"vue-fragment": "^1.6.0",
"vue-frag": "^1.4.3",
"vue-material-design-icons": "^5.3.0",
"vue-observe-visibility": "^1.0.0",
"vue-router": "^3.5.3",
Expand Down
2 changes: 1 addition & 1 deletion src/components/CategoriesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
NcAppNavigationCaption,
NcAppNavigationCounter,
} from '@nextcloud/vue'
import { Fragment } from 'vue-fragment'
import { Fragment } from 'vue-frag'
import FolderIcon from 'vue-material-design-icons/Folder.vue'
import FolderOutlineIcon from 'vue-material-design-icons/FolderOutline.vue'
Expand Down
2 changes: 1 addition & 1 deletion src/components/HelpMobile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import { generateFilePath } from '@nextcloud/router'
import { Fragment } from 'vue-fragment'
import { Fragment } from 'vue-frag'
export default {
components: {
Expand Down
6 changes: 5 additions & 1 deletion src/components/NoteItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@

<NcActionSeparator />

<NcActionButton v-if="!note.readonly" :icon="actionDeleteIcon" @click="onDeleteNote">
<NcActionButton v-if="!note.readonly"
:icon="actionDeleteIcon"
:close-after-click="true"
@click="onDeleteNote"
>
{{ t('notes', 'Delete note') }}
</NcActionButton>
</template>
Expand Down

0 comments on commit 7d796c1

Please sign in to comment.