fix: Make edit mode in interactive widgets opt-in #3619
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/backport to stable29 |
max-nextcloud
approved these changes
Apr 24, 2024
src/view/Office.vue
Outdated
| @@ -83,11 +83,18 @@ | |||
| :style="{visibility: showIframe ? 'visible' : 'hidden' }" | |||
| :src="iframeSrc" /> | |||
|
|
|||
| <NcButton v-if="isEmbedded && !hasToggledInteractiveEmbedding" class="toggle-interactive" @click="toggleEdit"> | |||
| {{ t('text', 'Edit') }} | |||
There was a problem hiding this comment.
Suggested change
| {{ t('text', 'Edit') }} | |
| {{ t('richdocuments', 'Edit') }} |
src/view/Office.vue
Outdated
Comment on lines
479
to
482
| toggleEdit() { | ||
| this.hasToggledInteractiveEmbedding = true | ||
| }, | ||
|
|
There was a problem hiding this comment.
Minor naming nitpicks:
- This does not really toggle. It only sets to true.
- the names do not match well -
Editvs.InteractiveEmbedding.
How about this?
Suggested change
| toggleEdit() { | |
| this.hasToggledInteractiveEmbedding = true | |
| }, | |
| enableEditing() { | |
| this.hasEditingEnabled = true | |
| }, | |
There was a problem hiding this comment.
Good call, used hasWidgetEditingEnabled now to be more explicit about where its used.
Signed-off-by: Julius Härtl <[email protected]>
juliusknorr
force-pushed
the
fix/interactive-read-only
branch
from
df7fb7b to
442213f
Compare
|
Cypress fails due to the new 24.04 release of Collabora with changed selectors, will address separately |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #3540
A copy of nextcloud/text#5579 in most parts