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

EZP-31137: Fixed styles dropdown when custom ones are in use for RTE #1217

Merged
merged 4 commits into from
Feb 5, 2020
Merged

EZP-31137: Fixed styles dropdown when custom ones are in use for RTE #1217

merged 4 commits into from
Feb 5, 2020

Conversation

barw4
Copy link
Member

@barw4 barw4 commented Jan 31, 2020 •
edited
Loading

Question Answer
Tickets https://jira.ez.no/browse/EZP-31137
Bug fix? yes
New feature? no
BC breaks? no
Tests pass? yes
Doc needed? no
License GPL-2.0

ez-custom-style.js for alloy editor was overriding base config styles by filtering out default styles unnecessarily if custom styles were in use.

Checklist:

  • Coding standards ($ composer fix-cs)
  • Ready for Code Review

@barw4 barw4 requested review from dew326 and konradoboza January 31, 2020 11:10
@barw4 barw4 self-assigned this Jan 31, 2020
@barw4 barw4 requested review from GrabowskiM and lucasOsti January 31, 2020 11:11
dew326
dew326 requested changes Jan 31, 2020
View reviewed changes
Copy link
Member

@dew326 dew326 left a comment

Choose a reason for hiding this comment

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

I'm afraid it's not that simple.
I raised this during the development and added a comment in the CS ticket.

@barw4 barw4 changed the title EZP-31137: Fixed styles dropdown when custom ones are in use for RTE [WIP] EZP-31137: Fixed styles dropdown when custom ones are in use for RTE Jan 31, 2020
@barw4
Copy link
Member Author

barw4 commented Feb 3, 2020

I'm afraid it's not that simple.
I raised this during the development and added a comment in the CS ticket.

Yes, it seems about right - from what I've understood it was done on purpose this way, to prevent unnecessary data attributes to be left after switching to one of the default styles. Couldn't we remove those attributes just before changing the style to the custom one as shown in 5aa0f25?

@barw4 barw4 requested a review from dew326 February 3, 2020 10:02
@barw4 barw4 changed the title [WIP] EZP-31137: Fixed styles dropdown when custom ones are in use for RTE EZP-31137: Fixed styles dropdown when custom ones are in use for RTE Feb 3, 2020
@barw4 barw4 requested a review from dew326 February 4, 2020 13:17
@katarzynazawada katarzynazawada self-assigned this Feb 4, 2020
@lserwatka lserwatka merged commit e883d62 into 1.5 Feb 5, 2020
@lserwatka lserwatka deleted the EZP-31137 branch February 5, 2020 14:27
@lserwatka
Copy link
Member

Could you merge it up?

@dew326
Copy link
Member

dew326 commented Feb 5, 2020

@barw4 can you also prepare PR for ezplatform-richtext for master?

@barw4
Copy link
Member Author

barw4 commented Feb 5, 2020 •
edited
Loading

@dew326 should be done by tomorrow

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@katarzynazawada katarzynazawada katarzynazawada approved these changes

@konradoboza konradoboza konradoboza approved these changes

@lucasOsti lucasOsti lucasOsti approved these changes

@dew326 dew326 dew326 approved these changes

@GrabowskiM GrabowskiM GrabowskiM approved these changes

Assignees

@barw4 barw4

@katarzynazawada katarzynazawada

Labels
Bug QA approved
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@barw4 @lserwatka @dew326 @GrabowskiM @lucasOsti @konradoboza @katarzynazawada