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

Fix linebreaks in WYSWYG editor #6996

Merged
merged 43 commits into from
Dec 20, 2020
Merged

Fix linebreaks in WYSWYG editor #6996

merged 43 commits into from
Dec 20, 2020

Conversation

lahdeero
Copy link
Contributor

@lahdeero lahdeero commented Dec 7, 2020 •
edited
Loading

🎩 What? Why?

Common content management need is that user can make single line breaks into text. Currently in Decidim it's impossible to make line breaks, paragraph spacing comes after each press of the enter. For example, admin wants to add contact details into contact information page like this:

John Doe
john.doe@foo.bar
12345678


Joanna Doe
joanna.doe@foo.bar
987654321

This is more practical to do using line breaks / br tags and this module (pull request) adds line break / br tag feature to quill (editor). Works with shift+enter or clicking the icon in the toolbar.

📌 Related Issues

#2000
slab/quill#1187
slab/quill#252

Testing

Describe the best way to test or validate your PR.

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

  • ❓ CONSIDER adding a unit test if your PR resolves an issue.
  • ✔️ DO check open PR's to avoid duplicates.
  • ✔️ DO keep pull requests small so they can be easily reviewed.
  • ✔️ DO build locally before pushing.
  • ✔️ DO make sure tests pass.
  • ✔️ DO make sure any new changes are documented in docs/.
  • ✔️ DO add and modify seeds if necessary.
  • ✔️ DO add CHANGELOG upgrade notes if required.
  • ✔️ DO add to GraphQL API if there are new public fields.
  • ✔️ DO add link to MetaDecidim if it's a new feature.
  • ❌AVOID breaking the continuous integration build.
  • ❌AVOID making significant changes to the overall architecture.

📷 Screenshots

Please add screenshots of the changes you're proposing

♥️ Thank you!

codeclimate[bot]
codeclimate bot reviewed Dec 7, 2020
View reviewed changes
Copy link

@codeclimate codeclimate bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 11974 lines exceeds the maximum allowed for the inline comments feature.

@andreslucena andreslucena changed the title Feature/editor linebreak Fix linebreaks in WYSWYG editor Dec 15, 2020
@ivan-mr ivan-mr self-assigned this Dec 15, 2020
@ivan-mr ivan-mr self-requested a review December 15, 2020 21:36
ivan-mr
ivan-mr suggested changes Dec 15, 2020
View reviewed changes
Copy link
Contributor

@ivan-mr ivan-mr left a comment

Choose a reason for hiding this comment

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

Thanks @lahdeero ! Everything seems ok, but first of all you have to rebase your branch due to some conflicts.

@lahdeero
Trying to delete unnecessary newline at end
ed94701
@lahdeero
saving
ad88f0d
@lahdeero
Deletes linebreaks from last insert delta
9420375
@lahdeero
Added test for shift+enter linebreak
2979807
@lahdeero
Even if last insert delta has just one line break, content ends to th…
95975b7 
…ree line breaks
@lahdeero
Overriding enters functionality
f834694
@lahdeero
Fixed cursor when pressing enter at empty line
e33be2e
@lahdeero
Enter after empty list item end list
be03367
@lahdeero
Bugfix: Couldnt exit list using enter if it was end of text
b79c796
@lahdeero
Refactoring: different files for backspace and enter bindings
add38a1
@lahdeero
Fixes bug where backspace needs to be pressed twice to delete empty line
c6b5ef9
@lahdeero
Formats (e.g. bold) continues when pressing enter/shift+enter
0e3f9f7
@lahdeero
Fixed bug where backspace was deleting text from end even if cursor w…
1177c09 
…as in middle
@lahdeero
Fixed bug where enter didnt stop list format if cursor was end of the…
ca3fda8 
… range
@lahdeero
Removed console logs and bring back continueFormats
dd144b7
@lahdeero
Fixed bug where backspace deletes list format
5bebf00
@lahdeero
Backspace works but deletes character start of the string right to it
8d121d3
@lahdeero
Fixed bug where backspace deletes character right to it
333f426
@lahdeero
Backspace moves cursor back to list when pressed twice
4745236
@lahdeero
Backspace detects list type
8161dbb
@lahdeero
Fixed bug where after enter cursor moved too much if pressed after br…
90ed429 
… tag
@lahdeero
Creating tests for enter in lists
6b7b3b8
@lahdeero
Fixed bug where adding two many empty lines after list
ebc0181
@lahdeero
Added failing test for sake of ttd
eb40075
@lahdeero
Overriding backspace (also in other cases than offset 1)
c57aae6
@lahdeero
Fixed attributeDiff function
5c3a3f6
@lahdeero
Added more backspace tests for sake of tdd
820ca2c
@lahdeero
Fixed bug where backspace before list moved cursor one character forward
d1af7a2
@lahdeero
Fixed bug where backspace was deleting just invisible characters(smar…
a2104c9 
…tbreaks)
@lahdeero
Fixed ⏎ button and wrote a test for it
a07d5b7
@lahdeero
Fixing linter errors and cleaning console logs
350d9b5
@lahdeero
Cleaning and added few comments
f0914d9
@lahdeero
quill.js -> quill.min
1d57e6f
@lahdeero
Made editor.js more similar with core
1277291
@lahdeero
Adding semicolons
608cb76
@lahdeero
Changed namespace, fixed backspace bug and added test for the bug
835d86f
@lahdeero
Changed namespace, fixed backspace bug and added test for the bug
20febf9
@lahdeero
Last fix raised new bug, added some if else and new test
c451bc3
@lahdeero
Last fix raised new bug, added some if else and new test
38cd81b
@lahdeero
Removed quill.js (for debugging)
9b097ac
@lahdeero
Better variable name
a45fcd3
@lahdeero
Backspace deletes one invisible character when range is 1
09ee484
@lahdeero
Fixed bugs where backspace didnt work correctly
7e9ad54 
- Fixed bug where backspace deleted text twice
- Fixed bug where backspace didnt delete two invisible characters at once
- Added test
@lahdeero
Copy link
Contributor Author

@ivan-mr Done.

ivan-mr
ivan-mr approved these changes Dec 20, 2020
View reviewed changes
Copy link
Contributor

@ivan-mr ivan-mr left a comment

Choose a reason for hiding this comment

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

LGTM! thanks @lahdeero .

@ivan-mr ivan-mr merged commit c978b2f into decidim:develop Dec 20, 2020
@ahukkanen ahukkanen deleted the feature/editor-linebreak branch December 21, 2020 15:22
@mrcasals mrcasals added the type: fix PRs that implement a fix for a bug label Feb 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codeclimate CodeClimate CodeClimate left review comments

@ivan-mr ivan-mr ivan-mr approved these changes

Assignees

@ivan-mr ivan-mr

Labels
in-review module: admin module: core type: fix PRs that implement a fix for a bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lahdeero @ivan-mr @mrcasals