Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiple dots for highlights with notes that have multiple internal ranges

Browse Source
This commit is contained in:
Kovid Goyal 2020-08-12 12:18:11 +05:30
parent 10f3414426
commit 4154c3be14
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pyj/range_utils.pyj
View File

@ -93,7 +93,7 @@ def select_crw(crw):
return False return False
def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrapper): 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
start_offset = r.startOffset start_offset = r.startOffset
@ -118,6 +118,7 @@ def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrap
current_range.surroundContents(current_wrapper) current_range.surroundContents(current_wrapper)
if process_wrapper: if process_wrapper:
process_wrapper(current_wrapper) process_wrapper(current_wrapper)
all_wrappers.push(current_wrapper)
return current_wrapper return current_wrapper
return wrap_node return wrap_node
@ -126,7 +127,7 @@ def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrap
wrapper_counter = 0 wrapper_counter = 0
def wrap_text_in_range(styler, r, class_to_add, process_wrapper): def wrap_text_in_range(styler, r, class_to_add_to_last, process_wrapper):
if not r: if not r:
sel = window.getSelection() sel = window.getSelection()
if not sel or not sel.rangeCount: if not sel or not sel.rangeCount:
@ -136,17 +137,18 @@ def wrap_text_in_range(styler, r, class_to_add, process_wrapper):
return None, v'[]' return None, v'[]'
wrapper_elem = document.createElement('span') wrapper_elem = document.createElement('span')
if class_to_add:
wrapper_elem.classList.add(class_to_add)
wrapper_elem.dataset.calibreRangeWrapper = v'++wrapper_counter' + '' wrapper_elem.dataset.calibreRangeWrapper = v'++wrapper_counter' + ''
if styler: if styler:
styler(wrapper_elem) styler(wrapper_elem)
intersecting_wrappers = {} intersecting_wrappers = {}
wrap_node = create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrapper) all_wrappers = v'[]'
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)
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:
all_wrappers[-1].classList.add(class_to_add_to_last)
return crw, Object.keys(intersecting_wrappers) return crw, Object.keys(intersecting_wrappers)