From 1378b766ee0ba3eb8020e98d7adb7ca84df7aa86 Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Tue, 5 Dec 2017 22:00:16 +0200 Subject: [PATCH] Finish hooking up Draftail CSS & JS to Django widget --- client/src/components/Draftail/index.js | 2 +- wagtail/admin/rich_text/editors/draftail.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/src/components/Draftail/index.js b/client/src/components/Draftail/index.js index 6e36b6a77..eaeae9bbe 100644 --- a/client/src/components/Draftail/index.js +++ b/client/src/components/Draftail/index.js @@ -16,7 +16,7 @@ export const initEditor = (fieldName, options = {}) => { field.value = JSON.stringify(rawContentState || {}); }; - if (options.entityTypes) { + if (options && options.entityTypes) { // eslint-disable-next-line no-param-reassign options.entityTypes = options.entityTypes.map(entity => Object.assign(entity, { source: registry.getSource(entity.source), diff --git a/wagtail/admin/rich_text/editors/draftail.py b/wagtail/admin/rich_text/editors/draftail.py index 453f9fb1d..c90ddf253 100644 --- a/wagtail/admin/rich_text/editors/draftail.py +++ b/wagtail/admin/rich_text/editors/draftail.py @@ -5,9 +5,10 @@ from django.forms import Media, widgets from wagtail.admin.edit_handlers import RichTextFieldPanel from wagtail.admin.rich_text.converters.contentstate import ContentstateConverter from wagtail.core.rich_text import features +from wagtail.utils.widgets import WidgetWithScript -class DraftailRichTextArea(widgets.Textarea): +class DraftailRichTextArea(WidgetWithScript, widgets.Textarea): # this class's constructor accepts a 'features' kwarg accepts_features = True @@ -47,5 +48,5 @@ class DraftailRichTextArea(widgets.Textarea): return Media(js=[ 'wagtailadmin/js/draftail.js', ], css={ - 'all': ['wagtailadmin/css/panels/dratail.css'] + 'all': ['wagtailadmin/css/panels/draftail.css'] })