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

CKEditor Advanced Options - Better validation of options #11752

Merged
merged 3 commits into from
Mar 5, 2018

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Mar 2, 2018

Overview

In the "Advanced Options" of the CKEditor Configurator, api options can be selected. This tweaks the UI to prevent the same option from being selected twice, which would not make sense.

Before

screenshot from 2018-03-02 09 44 36

After

screenshot from 2018-03-02 09 41 25

@colemanw
Copy link
Member Author

colemanw commented Mar 2, 2018

@seamuslee001 since you were just in there, can you also take a look at this one? It should be straightforward.

@colemanw
Copy link
Member Author

colemanw commented Mar 2, 2018

While I was at it I also added some validation for JSON input. This will prevent users from entering malformed JSON or raw javascript code.
screenshot from 2018-03-02 12 50 55

@seamuslee001
Copy link
Contributor

will take a look @colemanw

@colemanw colemanw changed the title CKEditor Advanced Options - Don't allow same option to be selected twice CKEditor Advanced Options - Better validation of options Mar 3, 2018
@seamuslee001
Copy link
Contributor

(CiviCRM Review Template WORD-1.1)

@seamuslee001 seamuslee001 merged commit 6e6fff4 into civicrm:master Mar 5, 2018
@colemanw colemanw deleted the CKEditor branch March 5, 2018 14:38
@mlutfy mlutfy added this to the 4.7.32 milestone Mar 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants