mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Use constants for whitespace behaviour flag values 

Discussion: https://github.com/wagtail/wagtail/pull/4136#discussion_r162252303
pull/4136/head
Matt Westcott 2018-01-24 11:56:31 +00:00
rodzic 2287624434
commit 211cd3dd40
1 zmienionych plików z 22 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

38
wagtail/admin/rich_text/converters/html_to_contentstate.py
Wyświetl plik

@ -9,13 +9,19 @@ from wagtail.core.rich_text import features as feature_registry
from wagtail.core.models import Page from wagtail.core.models import Page
# constants to keep track of what to do with leading whitespace on the next text node we encounter
STRIP_WHITESPACE = 0
KEEP_WHITESPACE = 1
FORCE_WHITESPACE = 2
class HandlerState(object): class HandlerState(object):
def __init__(self): def __init__(self):
self.current_block = None self.current_block = None
self.current_inline_styles = [] self.current_inline_styles = []
self.current_entity_ranges = [] self.current_entity_ranges = []
# what to do with leading whitespace on the next text node we encounter: strip, keep or force # what to do with leading whitespace on the next text node we encounter: strip, keep or force
self.leading_whitespace = 'strip' self.leading_whitespace = STRIP_WHITESPACE
self.list_depth = 0 self.list_depth = 0
self.list_item_type = None self.list_item_type = None
self.pushed_states = [] self.pushed_states = []
@ -72,7 +78,7 @@ class BlockElementHandler(object):
block = self.create_block(name, dict(attrs), state, contentstate) block = self.create_block(name, dict(attrs), state, contentstate)
contentstate.blocks.append(block) contentstate.blocks.append(block)
state.current_block = block state.current_block = block
state.leading_whitespace = 'strip' state.leading_whitespace = STRIP_WHITESPACE
def handle_endtag(self, name, state, contentState): def handle_endtag(self, name, state, contentState):
assert not state.current_inline_styles, "End of block reached without closing inline style elements" assert not state.current_inline_styles, "End of block reached without closing inline style elements"
@ -98,11 +104,11 @@ class InlineStyleElementHandler(object):
def handle_starttag(self, name, attrs, state, contentstate): def handle_starttag(self, name, attrs, state, contentstate):
assert state.current_block is not None, "%s element found at the top level" % name assert state.current_block is not None, "%s element found at the top level" % name
if state.leading_whitespace == 'force': if state.leading_whitespace == FORCE_WHITESPACE:
# any pending whitespace should be output before handling this tag, # any pending whitespace should be output before handling this tag,
# and subsequent whitespace should be collapsed into it (= stripped) # and subsequent whitespace should be collapsed into it (= stripped)
state.current_block.text += ' ' state.current_block.text += ' '
state.leading_whitespace = 'strip' state.leading_whitespace = STRIP_WHITESPACE
inline_style_range = InlineStyleRange(self.style) inline_style_range = InlineStyleRange(self.style)
inline_style_range.offset = len(state.current_block.text) inline_style_range.offset = len(state.current_block.text)
@ -126,11 +132,11 @@ class InlineEntityElementHandler(object):
def handle_starttag(self, name, attrs, state, contentstate): def handle_starttag(self, name, attrs, state, contentstate):
assert state.current_block is not None, "%s element found at the top level" % name assert state.current_block is not None, "%s element found at the top level" % name
if state.leading_whitespace == 'force': if state.leading_whitespace == FORCE_WHITESPACE:
# any pending whitespace should be output before handling this tag, # any pending whitespace should be output before handling this tag,
# and subsequent whitespace should be collapsed into it (= stripped) # and subsequent whitespace should be collapsed into it (= stripped)
state.current_block.text += ' ' state.current_block.text += ' '
state.leading_whitespace = 'strip' state.leading_whitespace = STRIP_WHITESPACE
attrs = dict(attrs) attrs = dict(attrs)
@ -230,7 +236,7 @@ class HtmlToContentStateHandler(HTMLParser):
def add_block(self, block): def add_block(self, block):
self.contentstate.blocks.append(block) self.contentstate.blocks.append(block)
self.state.current_block = block self.state.current_block = block
self.state.leading_whitespace = 'strip' self.state.leading_whitespace = STRIP_WHITESPACE
def handle_starttag(self, name, attrs): def handle_starttag(self, name, attrs):
element_handler = self.element_handlers.match(name, dict(attrs)) element_handler = self.element_handlers.match(name, dict(attrs))
@ -263,29 +269,29 @@ class HtmlToContentStateHandler(HTMLParser):
self.add_block(Block('unstyled', depth=self.state.list_depth)) self.add_block(Block('unstyled', depth=self.state.list_depth))
if content == ' ': if content == ' ':
# if leading_whitespace = 'strip', this whitespace node is not significant # if leading_whitespace = strip, this whitespace node is not significant
# and should be skipped. # and should be skipped.
# For other cases, _don't_ output the whitespace yet, but set leading_whitespace = 'force' # For other cases, _don't_ output the whitespace yet, but set leading_whitespace = force
# so that a space is forced before the next text node or inline element. If no such node # so that a space is forced before the next text node or inline element. If no such node
# appears (= we reach the end of the block), the whitespace can rightfully be dropped. # appears (= we reach the end of the block), the whitespace can rightfully be dropped.
if self.state.leading_whitespace != 'strip': if self.state.leading_whitespace != STRIP_WHITESPACE:
self.state.leading_whitespace = 'force' self.state.leading_whitespace = FORCE_WHITESPACE
else: else:
# strip or add leading whitespace according to the leading_whitespace flag # strip or add leading whitespace according to the leading_whitespace flag
if self.state.leading_whitespace == 'strip': if self.state.leading_whitespace == STRIP_WHITESPACE:
content = content.lstrip() content = content.lstrip()
elif self.state.leading_whitespace == 'force' and not content.startswith(' '): elif self.state.leading_whitespace == FORCE_WHITESPACE and not content.startswith(' '):
content = ' ' + content content = ' ' + content
if content.endswith(' '): if content.endswith(' '):
# don't output trailing whitespace yet, because we want to discard it if the end # don't output trailing whitespace yet, because we want to discard it if the end
# of the block follows. Instead, we'll set leading_whitespace = 'force' so that # of the block follows. Instead, we'll set leading_whitespace = force so that
# any following text or inline element will be prefixed by a space # any following text or inline element will be prefixed by a space
content = content.rstrip() content = content.rstrip()
self.state.leading_whitespace = 'force' self.state.leading_whitespace = FORCE_WHITESPACE
else: else:
# no trailing whitespace here - any leading whitespace at the start of the # no trailing whitespace here - any leading whitespace at the start of the
# next text node should be respected # next text node should be respected
self.state.leading_whitespace = 'keep' self.state.leading_whitespace = KEEP_WHITESPACE
self.state.current_block.text += content self.state.current_block.text += content