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.

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

fix(addContent): only process addExtensions once #6602

Merged
merged 1 commit into from
Nov 6, 2024

Conversation

max-nextcloud
Copy link
Collaborator

Use editor.options.extensions.
This only includes the extensions that were configured
when instantiating the editor.
It does not include the extensions these extensions added.

generateJSON will process the provided extensions
and add extensions according to their addExtensions field.

Before we used editor.editorManager.extensions
which includes all extensions used in the editor
including those added by other extensions.
This lead to generateJSON adding the same extensions again
which resulted in a warning.

Use `editor.options.extensions`.
This only includes the extensions that were configured
when instantiating the editor.
It does not include the extensions these extensions added.

`generateJSON` will process the provided extensions
and add extensions according to their `addExtensions` field.

Before we used `editor.editorManager.extensions`
which includes all extensions used in the editor
including those added by other extensions.
This lead to `generateJSON` adding the same extensions again
which resulted in a warning.

Signed-off-by: Max <[email protected]>
@max-nextcloud
Copy link
Collaborator Author

/backport to stable30

Copy link
Member

@mejo- mejo- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the swift fix ❤️

@mejo-
Copy link
Member

mejo- commented Nov 5, 2024

/backport to stable29

Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch 👍

@juliusknorr juliusknorr merged commit af98ade into main Nov 6, 2024
59 of 61 checks passed
@juliusknorr juliusknorr deleted the fix/warning-about-duplicate-extensions branch November 6, 2024 07:20
Copy link

backportbot bot commented Nov 6, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/6602/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick ebaae962

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6602/stable29

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Copy link

backportbot bot commented Nov 6, 2024

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30

# Create the new backport branch
git checkout -b backport/6602/stable30

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick ebaae962

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6602/stable30

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants