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

When creating range wrappers, normalize parent nodes to ensure there are no empty text nodes, as these mess up CFI calculations

Browse Source
This commit is contained in:
Kovid Goyal 2020-08-20 09:21:27 +05:30
parent 11d00b59ea
commit d1a5850619
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pyj/range_utils.pyj
View File

@ -104,6 +104,8 @@ def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrap
current_range = (node.ownerDocument or document).createRange() current_range = (node.ownerDocument or document).createRange()
current_wrapper = wrapper_elem.cloneNode() current_wrapper = wrapper_elem.cloneNode()
current_range.selectNodeContents(node) current_range.selectNodeContents(node)
# adjust start and end in case the current node is one of the
# boundaries of the original range
if node.isSameNode(start_node): if node.isSameNode(start_node):
current_range.setStart(node, start_offset) current_range.setStart(node, start_offset)
start_node = current_wrapper start_node = current_wrapper
@ -116,6 +118,10 @@ def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrap
if crw: if crw:
intersecting_wrappers[crw] = True intersecting_wrappers[crw] = True
current_range.surroundContents(current_wrapper) current_range.surroundContents(current_wrapper)
# remove any empty text nodes created by surroundContents() on either
# side of the wrapper. This happens for instance on Chrome when
# wrapping all text inside <i>some text</i>
current_range.commonAncestorContainer.normalize()
if process_wrapper: if process_wrapper:
process_wrapper(current_wrapper) process_wrapper(current_wrapper)
all_wrappers.push(current_wrapper) all_wrappers.push(current_wrapper)