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

Remove TinyMCE options from the body. #2059

Merged
merged 1 commit into from May 30, 2017

Conversation

Projects
None yet
2 participants
@thet
Member

thet commented May 29, 2017

Remove TinyMCE pattern options from the body, as these are always set on the richtext fields mimetype selector or - if not there - on the textfield itself.

regarding the mimetype selector managing tinymce options see: https://github.com/plone/plone.app.z3cform/blob/master/plone/app/z3cform/widget.py#L615 (I don't like how the options are managed (mainly because I've written the code myself), but this allows for switching between different editors - plain for .rst, .txt, .md, etc. and tinymce for html mimetypes)

Merge together:

@thet

This comment has been minimized.

Show comment
Hide comment
@thet

thet May 29, 2017

Member

Let's see if tests break.

Member

thet commented May 29, 2017

Let's see if tests break.

Remove TinyMCE options from the body.
Remove TinyMCE pattern options from the body, as these are always set on the richtext fields mimetype selector or - if not there - on the textfield itself.

thet added a commit to plone/plone.app.contenttypes that referenced this pull request May 30, 2017

@thet thet requested a review from jensens May 30, 2017

@jensens jensens merged commit 5ee4655 into master May 30, 2017

3 checks passed

Changelog verifier Entry found
Details
Plone Contributors Agreement verifier All users have signed it
Details
Plone Jenkins CI - pull-request-5.1 Job finished with success status
Details

@jensens jensens deleted the thet-remove-body-tinymceopts branch May 30, 2017

mister-roboto pushed a commit to plone/buildout.coredev that referenced this pull request May 30, 2017

[fc] Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2017-05-30T11:09:55+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.contenttypes@58f1f35

Fix test for checking if TinyMCE is loaded which broke after plone/Products.CMFPlone#2059

Files changed:
M CHANGES.rst
M plone/app/contenttypes/tests/test_behaviors_richtext.py
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2017-05-30T14:20:17+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.contenttypes@fed0941

Merge pull request #403 from plone/thet-fixtest

Fix test for checking if TinyMCE is loaded which broke after...

Files changed:
M CHANGES.rst
M plone/app/contenttypes/tests/test_behaviors_richtext.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment