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

Jump to bottom

[full-ci] Bugfix: Copy/Cut/Paste, paste shortcut doesn't trigger sometimes #8480

Merged
merged 2 commits into from
Feb 20, 2023
Merged

[full-ci] Bugfix: Copy/Cut/Paste, paste shortcut doesn't trigger sometimes #8480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4526fd0
Bugfix: Copy/Cut/Paste, paste shortcut doesn't trigger sometimes
lookacat Feb 20, 2023
139523c
Update changelog
lookacat Feb 20, 2023
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
6 changes: 6 additions & 0 deletions changelog/unreleased/bugfix-paste-action-conflict-dialog-broken
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Paste action conflict dialog broken

We've fixed a bug that resulted in the paste action not doing anything in cases of a conflict

https://github.com/owncloud/web/pull/8480
https://github.com/owncloud/web/issues/8462
12 changes: 9 additions & 3 deletions packages/web-app-files/src/components/FilesList/KeyboardActions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,15 @@ export default defineComponent({
store.dispatch('Files/pasteSelectedFiles', {
targetSpace: props.space,
clientService: clientService,
createModal: instance.createModal, // FIXME
hideModal: instance.hideModal, // FIXME
showMessage: instance.showMessage, // FIXME
createModal: (modal) => {
store.dispatch('createModal', modal)
},
hideModal: (modal) => {
store.dispatch('hideModal', modal)
},
showMessage: (msg) => {
store.dispatch('showMessage', msg)
},
$gettext: language.$gettext,
$gettextInterpolate: language.interpolate,
$ngettext: language.$ngettext
Expand Down
7 changes: 4 additions & 3 deletions pnpm-lock.yaml
View file
Open in desktop

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