TinyMCE, Redactor support and cleanups

pydanny / django-wysiwyg

A Django application for making Django textareas rich text editors. Certainly as a template tag and possibly as a form widget.

http://django-wysiwyg.readthedocs.org

MIT License

465 stars 63 forks source link

TinyMCE, Redactor support and cleanups #24

Closed vdboor closed 11 years ago

vdboor commented 12 years ago

Hi,

I've been improving django-wysiwyg. This did result in a larger pull request, but I hope you can include the features nevertheless. If I'd have to rebase, please let me know.

This adds:

TinyMCE support
Redactor support
automatically use the JavaScript files from django-ckeditor and django-tinymce if they are installed.
make DJANGO_WYSIWYG_MEDIA_URL agnostic to the editor (not STATIC_URL/ckeditor by default)
fix that test_project got installed in site-packages too.
fix pytidylib usage (had symbol errors)
cleanups

Greetings, Diederik

pydanny commented 11 years ago

Had to fix a {{ config }} bug but it happened after this merge. Otherwise this looks good!

pydanny commented 11 years ago

Argh! Github won't mark this as really merged. But it is!

vdboor commented 11 years ago

Ah, thanks! :) Good to see the changes are in, and glad you made the |default:"{}" fix :)

I noticed all changes are in 7d7e6fbf55b44bfbf241dd740837fdc8c9db183c, I guess you made a squashed merge or something? ;)

pydanny commented 11 years ago

Thanks for submitting. The merge ended up being funny, but it's in.

Also see https://github.com/pydanny/django-wysiwyg/issues/28.

When I get time next month I plan to dive in.