Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

comments editor: Do not insert unnecessary <p> tags

Browse Source
This commit is contained in:
Kovid Goyal 2010-12-23 13:13:45 -07:00
parent 853f63934f
commit ab2767ccde
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/comments_editor.py
View File

@ -225,7 +225,7 @@ class EditorWidget(QWebView): # {{{
elems = [] elems = []
for body in root.xpath('//body'): for body in root.xpath('//body'):
if body.text: if body.text:
elems.append('<p>%s</p>'%body.text) elems.append(body.text)
elems += [html.tostring(x, encoding=unicode) for x in body if elems += [html.tostring(x, encoding=unicode) for x in body if
x.tag not in ('script', 'style')] x.tag not in ('script', 'style')]
@ -233,6 +233,8 @@ class EditorWidget(QWebView): # {{{
ans = u'<div>%s</div>'%(u''.join(elems)) ans = u'<div>%s</div>'%(u''.join(elems))
else: else:
ans = u''.join(elems) ans = u''.join(elems)
if not ans.startswith('<'):
ans = '<p>%s</p>'%ans
ans = xml_replace_entities(ans) ans = xml_replace_entities(ans)
except: except:
import traceback import traceback