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

Make finding highlights overlapping the selection O(n) in the size of the selection rather than the number of existing highlights

Browse Source
This commit is contained in:
Kovid Goyal 2020-08-03 19:22:03 +05:30
parent 1d04aa3d44
commit 95248db34e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pyj/range_utils.pyj
View File

@ -28,6 +28,26 @@ def text_nodes_in_range(r):
return ans return ans
def first_annot_in_range(r, annot_id_uuid_map):
parent = r.commonAncestorContainer
doc = parent.ownerDocument or document
iterator = doc.createNodeIterator(parent)
in_range = False
while True:
node = iterator.nextNode()
if not node:
break
if not in_range and node.isSameNode(r.startContainer):
in_range = True
if in_range:
if node.dataset and node.dataset.calibreRangeWrapper:
annot_id = annot_id_uuid_map[node.dataset.calibreRangeWrapper]
if annot_id:
return annot_id
if node.isSameNode(r.endContainer):
break
def remove(node): def remove(node):
if node.parentNode: if node.parentNode:
node.parentNode.removeChild(node) node.parentNode.removeChild(node)
@ -174,12 +194,8 @@ def highlight_associated_with_selection(sel, annot_id_uuid_map):
if annot_id: if annot_id:
return annot_id return annot_id
all_wrappers = document.querySelectorAll('span[data-calibre-range-wrapper]')
for v'var i = 0; i < sel.rangeCount; i++': for v'var i = 0; i < sel.rangeCount; i++':
r = sel.getRangeAt(i) r = sel.getRangeAt(i)
for v'var x = 0; x < all_wrappers.length; x++': annot_id = first_annot_in_range(r, annot_id_uuid_map)
wrapper = all_wrappers[x] if annot_id:
if r.intersectsNode(wrapper): return annot_id
annot_id = annot_id_uuid_map[wrapper.dataset.calibreRangeWrapper]
if annot_id:
return annot_id