Skip to content

fix(image-editor): prevent double discard changes confirmation #2814

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

Merged
merged 1 commit into from
May 30, 2025
Merged

fix(image-editor): prevent double discard changes confirmation #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion css/init-BCDbjQ97.chunk.css → css/init-DWUwQFBL.chunk.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/viewer-init.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* extracted by css-entry-points-plugin */
@import './init-BCDbjQ97.chunk.css';
@import './init-DWUwQFBL.chunk.css';
@import './logger-60RCWKf0.chunk.css';
@import './NcActionButton-C9055XKu.chunk.css';
@import './NcActionLink-lgtGSyky.chunk.css';
58 changes: 28 additions & 30 deletions js/viewer-init.mjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-init.mjs.map
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 1 addition & 27 deletions src/components/ImageEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,7 @@ export default {
},

methods: {
onClose(closingReason, haveNotSavedChanges) {
if (haveNotSavedChanges) {
this.onExitWithoutSaving()
return
}
onClose() {
window.removeEventListener('keydown', this.handleKeydown, true)
this.$emit('close')
},
Expand Down Expand Up @@ -206,28 +202,6 @@ export default {
}
},

/**
* Show warning if unsaved changes
*/
onExitWithoutSaving() {
OC.dialogs.confirmDestructive(
translations.changesLoseWarningHint + '\n\n' + translations.discardChangesWarningHint,
t('viewer', 'Unsaved changes'),
{
type: OC.dialogs.YES_NO_BUTTONS,
confirm: t('viewer', 'Drop changes'),
confirmClasses: 'error',
cancel: translations.cancel,
},
(decision) => {
if (!decision) {
return
}
this.onClose('warning-ignored', false)
},
)
},

// Key Handlers, override default Viewer arrow and escape key
handleKeydown(event) {
// Enter needs to be reached through as otherwise saving text does not work
Expand Down
Loading