core (xml_tools), plugin XEP-0277: ElementParser element now manage automatically the wrapping with <div/> element when needed + fixed content_xhtml/title_xhtml in XEP-0277
This commit is contained in:
parent
b51b9a8887
commit
4a44b41793
2 changed files with 26 additions and 15 deletions
|
|
@ -361,20 +361,18 @@ class XEP_0277(object):
|
||||||
elem = entry_elt.addElement(elem_name)
|
elem = entry_elt.addElement(elem_name)
|
||||||
if type_:
|
if type_:
|
||||||
if type_ == '_rich': # convert input from current syntax to XHTML
|
if type_ == '_rich': # convert input from current syntax to XHTML
|
||||||
converted = yield synt.convert(data[attr], synt.getCurrentSyntax(profile), "XHTML")
|
xml_content = yield synt.convert(data[attr], synt.getCurrentSyntax(profile), "XHTML")
|
||||||
if '{}_xhtml'.format(elem_name) in data:
|
if '{}_xhtml'.format(elem_name) in data:
|
||||||
raise failure.Failure(exceptions.DataError(_("Can't have xhtml and rich content at the same time")))
|
raise failure.Failure(exceptions.DataError(_("Can't have xhtml and rich content at the same time")))
|
||||||
|
else:
|
||||||
|
xml_content = data[attr]
|
||||||
|
|
||||||
xml_content = u'<div xmlns="{ns}">{converted}</div>'.format(
|
div_elt = xml_tools.ElementParser()(xml_content, namespace=NS_XHTML)
|
||||||
ns=NS_XHTML,
|
if div_elt.name != 'div' or div_elt.uri != NS_XHTML or div_elt.attributes:
|
||||||
converted=converted)
|
# we need a wrapping <div/> at the top with XHTML namespace
|
||||||
div_elt = xml_tools.ElementParser()(xml_content)
|
wrap_div_elt = domish.Element((NS_XHTML, 'div'))
|
||||||
if len(div_elt.children) == 1:
|
wrap_div_elt.addChild(div_elt)
|
||||||
# if we have two <div> wrapping the content,
|
div_elt = wrap_div_elt
|
||||||
# we remove the one we have just added
|
|
||||||
child = div_elt.children[0]
|
|
||||||
if child.name == 'div' and not child.attributes and child.uri == div_elt.uri:
|
|
||||||
div_elt = child
|
|
||||||
elem.addChild(div_elt)
|
elem.addChild(div_elt)
|
||||||
elem['type'] = 'xhtml'
|
elem['type'] = 'xhtml'
|
||||||
if elem_name not in data:
|
if elem_name not in data:
|
||||||
|
|
|
||||||
|
|
@ -1326,11 +1326,19 @@ class ElementParser(object):
|
||||||
(c) Karl Anderson
|
(c) Karl Anderson
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __call__(self, raw_xml, force_spaces=False):
|
def __call__(self, raw_xml, force_spaces=False, namespace=None):
|
||||||
"""
|
"""
|
||||||
@param raw_xml(unicode): the raw XML
|
@param raw_xml(unicode): the raw XML
|
||||||
@param force_spaces: if True, replace occurrences of '\n' and '\t' with ' '.
|
@param force_spaces (bool): if True, replace occurrences of '\n' and '\t' with ' '.
|
||||||
|
@param namespace(unicode, None): if set, use this namespace for the wrapping element
|
||||||
"""
|
"""
|
||||||
|
# we need to wrap element in case
|
||||||
|
# there is not a unique one on the top
|
||||||
|
if namespace is not None:
|
||||||
|
raw_xml = u"<div xmlns='{}'>{}</div>".format(namespace, raw_xml)
|
||||||
|
else:
|
||||||
|
raw_xml = u"<div>{}</div>".format(raw_xml)
|
||||||
|
|
||||||
self.result = None
|
self.result = None
|
||||||
|
|
||||||
def onStart(elem):
|
def onStart(elem):
|
||||||
|
|
@ -1351,7 +1359,12 @@ class ElementParser(object):
|
||||||
raw_xml = raw_xml.replace('\n', ' ').replace('\t', ' ')
|
raw_xml = raw_xml.replace('\n', ' ').replace('\t', ' ')
|
||||||
tmp.addRawXml(raw_xml)
|
tmp.addRawXml(raw_xml)
|
||||||
parser.parse(tmp.toXml().encode('utf-8'))
|
parser.parse(tmp.toXml().encode('utf-8'))
|
||||||
return self.result.firstChildElement()
|
top_elt = self.result.firstChildElement()
|
||||||
|
# we now can check if there was a unique element on the top
|
||||||
|
# and remove our wrapping <div/> is this was the case
|
||||||
|
if len(top_elt.children) == 1:
|
||||||
|
top_elt = top_elt.firstChildElement()
|
||||||
|
return top_elt
|
||||||
|
|
||||||
|
|
||||||
# FIXME: this method is duplicated from frontends.tools.xmlui.getText
|
# FIXME: this method is duplicated from frontends.tools.xmlui.getText
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue