Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-04 21:44:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace draftjs_exporter constants with the corresponding Draft.js value

Browse source
This commit is contained in:
Thibaud Colas 2018-01-17 20:54:17 +02:00
parent 7c5c1054e4
commit f593aa2f98
8 changed files with 34 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wagtail/admin/rich_text/converters/contentstate.py
View file

@ -2,7 +2,6 @@ import json
import logging
import re
from draftjs_exporter.constants import BLOCK_TYPES, ENTITY_TYPES
from draftjs_exporter.defaults import render_children
from draftjs_exporter.dom import DOM
from draftjs_exporter.html import HTML as HTMLExporter
@ -29,7 +28,7 @@ def link_entity(props):
def br(props):
if props['block']['type'] == BLOCK_TYPES.CODE:
if props['block']['type'] == 'code-block':
return props['children']
return DOM.create_element('br')
@ -54,13 +53,13 @@ class ContentstateConverter():
exporter_config = {
'block_map': {
BLOCK_TYPES.UNSTYLED: 'p',
BLOCK_TYPES.ATOMIC: render_children,
BLOCK_TYPES.FALLBACK: block_fallback,
'unstyled': 'p',
'atomic': render_children,
'fallback': block_fallback,
},
'style_map': {},
'entity_decorators': {
ENTITY_TYPES.FALLBACK: entity_fallback,
'FALLBACK': entity_fallback,
},
'composite_decorators': [
{

47
wagtail/admin/wagtail_hooks.py
View file

@ -2,7 +2,6 @@ from django.contrib.auth.models import Permission
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from draftjs_exporter.constants import BLOCK_TYPES, ENTITY_TYPES, INLINE_STYLES
from draftjs_exporter.dom import DOM
from wagtail.admin.menu import MenuItem, SubmenuMenuItem, settings_menu
@ -267,14 +266,14 @@ def register_core_features(features):
'hr': HorizontalRuleHandler(),
},
'to_database_format': {
'entity_decorators': {ENTITY_TYPES.HORIZONTAL_RULE: lambda props: DOM.create_element('hr')}
'entity_decorators': {'HORIZONTAL_RULE': lambda props: DOM.create_element('hr')}
}
})
features.register_editor_plugin(
'draftail', 'h1', draftail_features.BlockFeature({
'label': 'H1',
'type': BLOCK_TYPES.HEADER_ONE,
'type': 'header-one',
'description': str(_('Heading {level}').format(level=1)),
})
)
@ -283,13 +282,13 @@ def register_core_features(features):
'h1': BlockElementHandler('header-one'),
},
'to_database_format': {
'block_map': {BLOCK_TYPES.HEADER_ONE: 'h1'}
'block_map': {'header-one': 'h1'}
}
})
features.register_editor_plugin(
'draftail', 'h2', draftail_features.BlockFeature({
'label': 'H2',
'type': BLOCK_TYPES.HEADER_TWO,
'type': 'header-two',
'description': str(_('Heading {level}').format(level=2)),
})
)
@ -298,13 +297,13 @@ def register_core_features(features):
'h2': BlockElementHandler('header-two'),
},
'to_database_format': {
'block_map': {BLOCK_TYPES.HEADER_TWO: 'h2'}
'block_map': {'header-two': 'h2'}
}
})
features.register_editor_plugin(
'draftail', 'h3', draftail_features.BlockFeature({
'label': 'H3',
'type': BLOCK_TYPES.HEADER_THREE,
'type': 'header-three',
'description': str(_('Heading {level}').format(level=3)),
})
)
@ -313,13 +312,13 @@ def register_core_features(features):
'h3': BlockElementHandler('header-three'),
},
'to_database_format': {
'block_map': {BLOCK_TYPES.HEADER_THREE: 'h3'}
'block_map': {'header-three': 'h3'}
}
})
features.register_editor_plugin(
'draftail', 'h4', draftail_features.BlockFeature({
'label': 'H4',
'type': BLOCK_TYPES.HEADER_FOUR,
'type': 'header-four',
'description': str(_('Heading {level}').format(level=4)),
})
)
@ -328,13 +327,13 @@ def register_core_features(features):
'h4': BlockElementHandler('header-four'),
},
'to_database_format': {
'block_map': {BLOCK_TYPES.HEADER_FOUR: 'h4'}
'block_map': {'header-four': 'h4'}
}
})
features.register_editor_plugin(
'draftail', 'h5', draftail_features.BlockFeature({
'label': 'H5',
'type': BLOCK_TYPES.HEADER_FIVE,
'type': 'header-five',
'description': str(_('Heading {level}').format(level=5)),
})
)
@ -343,13 +342,13 @@ def register_core_features(features):
'h5': BlockElementHandler('header-five'),
},
'to_database_format': {
'block_map': {BLOCK_TYPES.HEADER_FIVE: 'h5'}
'block_map': {'header-five': 'h5'}
}
})
features.register_editor_plugin(
'draftail', 'h6', draftail_features.BlockFeature({
'label': 'H6',
'type': BLOCK_TYPES.HEADER_SIX,
'type': 'header-six',
'description': str(_('Heading {level}').format(level=6)),
})
)
@ -358,12 +357,12 @@ def register_core_features(features):
'h6': BlockElementHandler('header-six'),
},
'to_database_format': {
'block_map': {BLOCK_TYPES.HEADER_SIX: 'h6'}
'block_map': {'header-six': 'h6'}
}
})
features.register_editor_plugin(
'draftail', 'ul', draftail_features.BlockFeature({
'type': BLOCK_TYPES.UNORDERED_LIST_ITEM,
'type': 'unordered-list-item',
'icon': 'list-ul',
'description': str(_('Bulleted list')),
})
@ -374,12 +373,12 @@ def register_core_features(features):
'li': ListItemElementHandler(),
},
'to_database_format': {
'block_map': {BLOCK_TYPES.UNORDERED_LIST_ITEM: {'element': 'li', 'wrapper': 'ul'}}
'block_map': {'unordered-list-item': {'element': 'li', 'wrapper': 'ul'}}
}
})
features.register_editor_plugin(
'draftail', 'ol', draftail_features.BlockFeature({
'type': BLOCK_TYPES.ORDERED_LIST_ITEM,
'type': 'ordered-list-item',
'icon': 'list-ol',
'description': str(_('Numbered list')),
})
@ -390,13 +389,13 @@ def register_core_features(features):
'li': ListItemElementHandler(),
},
'to_database_format': {
'block_map': {BLOCK_TYPES.ORDERED_LIST_ITEM: {'element': 'li', 'wrapper': 'ol'}}
'block_map': {'ordered-list-item': {'element': 'li', 'wrapper': 'ol'}}
}
})
features.register_editor_plugin(
'draftail', 'bold', draftail_features.InlineStyleFeature({
'type': INLINE_STYLES.BOLD,
'type': 'BOLD',
'icon': 'bold',
'description': str(_('Bold')),
})
@ -407,12 +406,12 @@ def register_core_features(features):
'strong': InlineStyleElementHandler('BOLD'),
},
'to_database_format': {
'style_map': {INLINE_STYLES.BOLD: 'b'}
'style_map': {'BOLD': 'b'}
}
})
features.register_editor_plugin(
'draftail', 'italic', draftail_features.InlineStyleFeature({
'type': INLINE_STYLES.ITALIC,
'type': 'ITALIC',
'icon': 'italic',
'description': str(_('Italic')),
})
@ -423,13 +422,13 @@ def register_core_features(features):
'em': InlineStyleElementHandler('ITALIC'),
},
'to_database_format': {
'style_map': {INLINE_STYLES.ITALIC: 'i'}
'style_map': {'ITALIC': 'i'}
}
})
features.register_editor_plugin(
'draftail', 'link', draftail_features.EntityFeature({
'type': ENTITY_TYPES.LINK,
'type': 'LINK',
'icon': 'link',
'description': str(_('Link')),
'source': 'ModalWorkflowSource',
@ -449,6 +448,6 @@ def register_core_features(features):
'a[linktype="page"]': PageLinkElementHandler('LINK'),
},
'to_database_format': {
'entity_decorators': {ENTITY_TYPES.LINK: link_entity}
'entity_decorators': {'LINK': link_entity}
}
})

3
wagtail/documents/rich_text.py
View file

@ -1,5 +1,4 @@
from django.utils.html import escape
from draftjs_exporter.constants import ENTITY_TYPES
from draftjs_exporter.dom import DOM
from wagtail.admin.rich_text.converters import editor_html
@ -78,6 +77,6 @@ ContentstateDocumentLinkConversionRule = {
'a[linktype="document"]': DocumentLinkElementHandler('DOCUMENT'),
},
'to_database_format': {
'entity_decorators': {ENTITY_TYPES.DOCUMENT: document_link_entity}
'entity_decorators': {'DOCUMENT': document_link_entity}
}
}

4
wagtail/documents/wagtail_hooks.py
View file

@ -7,8 +7,6 @@ from django.utils.html import format_html, format_html_join
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext
from draftjs_exporter.constants import ENTITY_TYPES
from wagtail.admin.menu import MenuItem
from wagtail.admin.rich_text import HalloPlugin
import wagtail.admin.rich_text.editors.draftail.features as draftail_features
@ -89,7 +87,7 @@ def register_document_feature(features):
)
features.register_editor_plugin(
'draftail', 'document-link', draftail_features.EntityFeature({
'type': ENTITY_TYPES.DOCUMENT,
'type': 'DOCUMENT',
'icon': 'doc-full',
'description': str(_('Document')),
'source': 'ModalWorkflowSource',

3
wagtail/embeds/rich_text.py
View file

@ -1,4 +1,3 @@
from draftjs_exporter.constants import ENTITY_TYPES
from draftjs_exporter.dom import DOM
from wagtail.admin.rich_text.converters import editor_html
@ -96,6 +95,6 @@ ContentstateMediaConversionRule = {
'embed[embedtype="media"]': MediaEmbedElementHandler(),
},
'to_database_format': {
'entity_decorators': {ENTITY_TYPES.EMBED: media_embed_entity}
'entity_decorators': {'EMBED': media_embed_entity}
}
}

4
wagtail/embeds/wagtail_hooks.py
View file

@ -3,8 +3,6 @@ from django.urls import reverse
from django.utils.html import format_html
from django.utils.translation import ugettext_lazy as _
from draftjs_exporter.constants import ENTITY_TYPES
from wagtail.admin.rich_text import HalloPlugin
import wagtail.admin.rich_text.editors.draftail.features as draftail_features
from wagtail.core import hooks
@ -54,7 +52,7 @@ def register_embed_feature(features):
# define a draftail plugin to use when the 'embed' feature is active
features.register_editor_plugin(
'draftail', 'embed', draftail_features.EntityFeature({
'type': ENTITY_TYPES.EMBED,
'type': 'EMBED',
'icon': 'media',
'description': str(_('Embed')),
'source': 'ModalWorkflowSource',

3
wagtail/images/rich_text.py
View file

@ -1,4 +1,3 @@
from draftjs_exporter.constants import ENTITY_TYPES
from draftjs_exporter.dom import DOM
from wagtail.admin.rich_text.converters import editor_html
@ -114,6 +113,6 @@ ContentstateImageConversionRule = {
'embed[embedtype="image"]': ImageElementHandler(),
},
'to_database_format': {
'entity_decorators': {ENTITY_TYPES.IMAGE: image_entity}
'entity_decorators': {'IMAGE': image_entity}
}
}

4
wagtail/images/wagtail_hooks.py
View file

@ -19,8 +19,6 @@ from wagtail.images.rich_text import (
ContentstateImageConversionRule, EditorHTMLImageConversionRule, image_embedtype_handler
)
from draftjs_exporter.constants import ENTITY_TYPES
@hooks.register('register_admin_urls')
def register_admin_urls():
@ -89,7 +87,7 @@ def register_image_feature(features):
# define a draftail plugin to use when the 'image' feature is active
features.register_editor_plugin(
'draftail', 'image', draftail_features.EntityFeature({
'type': ENTITY_TYPES.IMAGE,
'type': 'IMAGE',
'icon': 'image',
'description': str(_('Image')),
'source': 'ModalWorkflowSource',