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

E-book viewer: Fix some adjacent highlights with nothing in between them not being displayed.

Browse Source
This commit is contained in:
Kovid Goyal 2023-02-16 12:59:48 +05:30
parent 44f157bc94
commit c4f3fe5745
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pyj/range_utils.pyj
View File

@ -151,6 +151,13 @@ def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrap
current_range.setEnd(node, end_offset) current_range.setEnd(node, end_offset)
end_node = current_wrapper end_node = current_wrapper
end_offset = 1 end_offset = 1
if current_range.collapsed:
# Dont wrap empty ranges. This is needed otherwise two adjacent
# selections of text will incorrectly be detected as overlapping.
# For example: highlight abc then def in the word abcdef here the
# second highlight's first range is the collapsed range at the end
# of <span wrapper-for-first-highlight>abc<span wrapper-for-2nd></span></span>
return
crw = node.parentNode?.dataset?.calibreRangeWrapper crw = node.parentNode?.dataset?.calibreRangeWrapper
if crw: if crw:
intersecting_wrappers[crw] = True intersecting_wrappers[crw] = True
@ -158,7 +165,6 @@ def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrap
if process_wrapper: if process_wrapper:
process_wrapper(current_wrapper) process_wrapper(current_wrapper)
all_wrappers.push(current_wrapper) all_wrappers.push(current_wrapper)
return current_wrapper
return wrap_node return wrap_node
@ -184,10 +190,13 @@ def wrap_text_in_range(styler, r, class_to_add_to_last, process_wrapper):
all_wrappers = v'[]' all_wrappers = v'[]'
wrap_node = create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrapper, all_wrappers) wrap_node = create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrapper, all_wrappers)
text_nodes_in_range(r).map(wrap_node) text_nodes_in_range(r).map(wrap_node)
ancestor = r.commonAncestorContainer
if ancestor.nodeType is Node.TEXT_NODE:
ancestor = ancestor.parentNode
# remove any empty text nodes created by surroundContents() on either # remove any empty text nodes created by surroundContents() on either
# side of the wrapper. This happens for instance on Chrome when # side of the wrapper. This happens for instance on Chrome when
# wrapping all text inside <i>some text</i> # wrapping all text inside <i>some text</i>
r.commonAncestorContainer.normalize() ancestor.normalize()
crw = wrapper_elem.dataset.calibreRangeWrapper crw = wrapper_elem.dataset.calibreRangeWrapper
v'delete intersecting_wrappers[crw]' v'delete intersecting_wrappers[crw]'
if class_to_add_to_last and all_wrappers.length: if class_to_add_to_last and all_wrappers.length: