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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-26 08:50:31 +05:30
parent 13d12199d5
commit acd82a0bed
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pyj/range_utils.pyj
View File

@ -93,6 +93,14 @@ def select_crw(crw):
return False return False
def wrap_range(r, wrapper):
r.surroundContents(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>
r.commonAncestorContainer.normalize()
def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrapper, all_wrappers): def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrapper, all_wrappers):
start_node = r.startContainer start_node = r.startContainer
end_node = r.endContainer end_node = r.endContainer
@ -117,11 +125,7 @@ def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrap
crw = node.parentNode?.dataset?.calibreRangeWrapper crw = node.parentNode?.dataset?.calibreRangeWrapper
if crw: if crw:
intersecting_wrappers[crw] = True intersecting_wrappers[crw] = True
current_range.surroundContents(current_wrapper) wrap_range(current_range, 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)