Move remove null bytes functionality to editor_will_munge_html hook

This commit is contained in:
Henrik Giesel 2020-08-09 10:35:52 +02:00
parent b380f304bf
commit 1b9bd70bb1

View File

@ -389,8 +389,6 @@ class Editor:
print("ignored late blur") print("ignored late blur")
return return
txt = self.mungeHTML(txt) txt = self.mungeHTML(txt)
# misbehaving apps may include a null byte in the text
txt = txt.replace("\x00", "")
# reverse the url quoting we added to get images to display # reverse the url quoting we added to get images to display
txt = self.mw.col.media.escapeImages(txt, unescape=True) txt = self.mw.col.media.escapeImages(txt, unescape=True)
self.note.fields[ord] = txt self.note.fields[ord] = txt
@ -1202,6 +1200,10 @@ def fontMungeHack(font):
def munge_html(txt, editor): def munge_html(txt, editor):
return "" if txt in ("<br>", "<div><br></div>") else txt return "" if txt in ("<br>", "<div><br></div>") else txt
def remove_null_bytes(txt, editor):
# misbehaving apps may include a null byte in the text
return txt.replace("\x00", "")
gui_hooks.editor_will_use_font_for_field.append(fontMungeHack) gui_hooks.editor_will_use_font_for_field.append(fontMungeHack)
gui_hooks.editor_will_munge_html.append(munge_html) gui_hooks.editor_will_munge_html.append(munge_html)
gui_hooks.editor_will_munge_html.append(remove_null_bytes)