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

Enabled support for nested block quotes #9382

Merged
merged 5 commits into from
Apr 7, 2021
Merged

Enabled support for nested block quotes #9382

merged 5 commits into from
Apr 7, 2021

Conversation

psmyrek
Copy link
Contributor

@psmyrek psmyrek commented Mar 30, 2021

Suggested merge commit message (convention)

Feature (block-quote): Enabled support for nested block quotes. Closes #9210.


Additional information

Support for nested block quotes in CF has a dedicated follow-up: https://github.com/cksource/collaboration-features/issues/3892.
After a brief check, I wasn't able to blow up the editor in CF samples.

@psmyrek
Copy link
Contributor Author

psmyrek commented Mar 30, 2021

PR is ready for testing @ckeditor/qa-team.

@FilipTokarski
Copy link
Member

Looks fine, I didn't find any bugs 👍

@Reinmar
Copy link
Member

Reinmar commented Apr 3, 2021

Could you update docs and manual tests in a similar way I did in #9362?

@psmyrek
Copy link
Contributor Author

psmyrek commented Apr 6, 2021

Sure. I've just added a short info in migration guide, a new section in block quote docs how to revert the old behavior and a manual test with the old behavior.

@Reinmar Reinmar self-requested a review April 7, 2021 10:29
@Reinmar Reinmar merged commit 18de0e2 into master Apr 7, 2021
@Reinmar Reinmar deleted the i/9210 branch April 7, 2021 10:53
kesselb added a commit to nextcloud/mail that referenced this pull request Sep 6, 2022
1)

Move conversion for paragraph to <p style="margin:0;"></p> to plugin

2) Drop schema listener for nested <blockQuote>.

Older versions of ckeditor did not support nested blockquotes[^1].
The schema listener is a workaround to keep nested blockquotes[^2].
CKEditor 28 added support for nested blockquotes back[^3][^4].

[^1]: ckeditor/ckeditor5#419 (comment)
[^2]: ckeditor/ckeditor5#419 (comment)
[^3]: ckeditor/ckeditor5#9382
[^4]: ckeditor/ckeditor5#9472

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit to nextcloud/mail that referenced this pull request Sep 6, 2022
1.

Move conversion for paragraph to <p style="margin:0;"></p> to plugin

2.

Drop schema listener for nested <blockQuote>.

Older versions of ckeditor did not support nested blockquotes[^1].
The schema listener is a workaround to keep nested blockquotes[^2].
CKEditor 28 added support for nested blockquotes back[^3][^4].

[^1]: ckeditor/ckeditor5#419 (comment)
[^2]: ckeditor/ckeditor5#419 (comment)
[^3]: ckeditor/ckeditor5#9382
[^4]: ckeditor/ckeditor5#9472

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit to nextcloud/mail that referenced this pull request Sep 6, 2022
1. Move conversion for paragraph to `<p style="margin:0;"></p>` to plugin

2. Drop schema listener for nested `<blockQuote>`.

Older versions of ckeditor did not support nested blockquotes[^1].
The schema listener is a workaround to keep nested blockquotes[^2].
CKEditor 28 added support for nested blockquotes back[^3][^4].

[^1]: ckeditor/ckeditor5#419 (comment)
[^2]: ckeditor/ckeditor5#419 (comment)
[^3]: ckeditor/ckeditor5#9382
[^4]: ckeditor/ckeditor5#9472

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit to nextcloud/mail that referenced this pull request Sep 6, 2022
Move conversion for paragraph to `<p style="margin:0;"></p>` to plugin

Older versions of ckeditor did not support nested blockquotes[^1].
The schema listener is a workaround to keep nested blockquotes[^2].
CKEditor 28 added support for nested blockquotes back[^3][^4].

[^1]: ckeditor/ckeditor5#419 (comment)
[^2]: ckeditor/ckeditor5#419 (comment)
[^3]: ckeditor/ckeditor5#9382
[^4]: ckeditor/ckeditor5#9472

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit to nextcloud/mail that referenced this pull request Sep 6, 2022
**Add mail plugin**

Move conversion for paragraph to `<p style="margin:0;"></p>` to plugin

**Drop schema listener for `<blockQuote>`**

Older versions of ckeditor did not support nested blockquotes[^1].
The schema listener is a workaround to keep nested blockquotes[^2].
CKEditor 28 added support for nested blockquotes back[^3][^4].

[^1]: ckeditor/ckeditor5#419 (comment)
[^2]: ckeditor/ckeditor5#419 (comment)
[^3]: ckeditor/ckeditor5#9382
[^4]: ckeditor/ckeditor5#9472

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit to nextcloud/mail that referenced this pull request Sep 6, 2022
**Add mail plugin**

Move conversion for paragraph to `<p style="margin:0;"></p>` to plugin

**Drop schema listener for `<blockQuote>`**

Older versions of ckeditor did not support nested blockquotes[^1].
The schema listener is a workaround to keep nested blockquotes[^2].
CKEditor 28 added support for nested blockquotes back[^3][^4].

[^1]: ckeditor/ckeditor5#419 (comment)
[^2]: ckeditor/ckeditor5#419 (comment)
[^3]: ckeditor/ckeditor5#9382
[^4]: ckeditor/ckeditor5#9472

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit to nextcloud/mail that referenced this pull request Sep 7, 2022
**Add mail plugin**

Move conversion for paragraph to `<p style="margin:0;"></p>` to plugin

**Drop schema listener for `<blockQuote>`**

Older versions of ckeditor did not support nested blockquotes[^1].
The schema listener is a workaround to keep nested blockquotes[^2].
CKEditor 28 added support for nested blockquotes back[^3][^4].

[^1]: ckeditor/ckeditor5#419 (comment)
[^2]: ckeditor/ckeditor5#419 (comment)
[^3]: ckeditor/ckeditor5#9382
[^4]: ckeditor/ckeditor5#9472

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit to nextcloud/mail that referenced this pull request Sep 20, 2022
**Add mail plugin**

Move conversion for paragraph to `<p style="margin:0;"></p>` to plugin

**Drop schema listener for `<blockQuote>`**

Older versions of ckeditor did not support nested blockquotes[^1].
The schema listener is a workaround to keep nested blockquotes[^2].
CKEditor 28 added support for nested blockquotes back[^3][^4].

[^1]: ckeditor/ckeditor5#419 (comment)
[^2]: ckeditor/ckeditor5#419 (comment)
[^3]: ckeditor/ckeditor5#9382
[^4]: ckeditor/ckeditor5#9472

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
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.

Add support for nested blockquotes
3 participants