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

Avoid error when selecting a non-existent range wrapper

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-20 09:48:14 +05:30
parent 60e8ddf968
commit 1f124726c2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pyj/range_utils.pyj
View File

@ -60,12 +60,17 @@ def unwrap_all_crw():
def select_crw(crw): def select_crw(crw):
nodes = document.querySelectorAll(f'span[data-calibre-range-wrapper="{crw}"]') nodes = document.querySelectorAll(f'span[data-calibre-range-wrapper="{crw}"]')
r = document.createRange() if nodes and nodes.length:
r.setStart(nodes[0].firstChild, 0) r = document.createRange()
r.setEnd(nodes[-1].lastChild, nodes[-1].lastChild.nodeValue.length) r.setStart(nodes[0].firstChild, 0)
sel = window.getSelection() r.setEnd(nodes[-1].lastChild, nodes[-1].lastChild.nodeValue.length)
sel.removeAllRanges() sel = window.getSelection()
sel.addRange(r) sel.removeAllRanges()
sel.addRange(r)
return True
else:
print(f'range-wrapper: {crw} does not exist')
return False
def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrapper): def create_wrapper_function(wrapper_elem, r, intersecting_wrappers, process_wrapper):

3
src/pyj/read_book/iframe.pyj
View File

@ -730,8 +730,7 @@ class IframeBoss:
set_selection_style(data.style) set_selection_style(data.style)
elif data.type is 'edit-highlight': elif data.type is 'edit-highlight':
crw_ = {v: k for k, v in Object.entries(annot_id_uuid_map)}[data.uuid] crw_ = {v: k for k, v in Object.entries(annot_id_uuid_map)}[data.uuid]
if crw_: if crw_ and select_crw(crw_):
select_crw(crw_)
self.ensure_selection_visible() self.ensure_selection_visible()
self.initiate_creation_of_annotation(data.uuid) self.initiate_creation_of_annotation(data.uuid)
elif data.type is 'remove-highlight': elif data.type is 'remove-highlight':