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

Workaround for Firefox sending null data in messages

Browse Source
This commit is contained in:
Kovid Goyal 2020-08-20 23:05:03 +05:30
parent 25adbe6bd6
commit e3e588c901
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pyj/iframe_comm.pyj
View File

@ -211,7 +211,7 @@ class IframeClient:
try: try:
func(data) func(data)
except Exception as e: except Exception as e:
console.log('Error in iframe message handler {}:'.format(data.action)) console.log('Error in iframe message handler {}:'.format(data?.action))
console.log(e) console.log(e)
details = traceback.format_exc() details = traceback.format_exc()
console.log(details) console.log(details)

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

@ -731,28 +731,29 @@ class IframeBoss:
end_reference_mode() end_reference_mode()
def annotations_msg_received(self, data): def annotations_msg_received(self, data):
if data.type is 'move-end-of-selection': dtype = data?.type
if dtype is 'move-end-of-selection':
move_end_of_selection(data.pos, data.start) move_end_of_selection(data.pos, data.start)
elif data.type is 'set-highlight-style': elif dtype is 'set-highlight-style':
set_selection_style(data.style) set_selection_style(data.style)
elif data.type is 'trigger-shortcut': elif dtype is 'trigger-shortcut':
self.on_handle_navigation_shortcut(data) self.on_handle_navigation_shortcut(data)
elif data.type is 'extend-to-paragraph': elif dtype is 'extend-to-paragraph':
sel = window.getSelection() sel = window.getSelection()
sel.modify('extend', 'forward', 'paragraphboundary') sel.modify('extend', 'forward', 'paragraphboundary')
end_node, end_offset = sel.focusNode, sel.focusOffset end_node, end_offset = sel.focusNode, sel.focusOffset
sel.modify('extend', 'backward', 'paragraphboundary') sel.modify('extend', 'backward', 'paragraphboundary')
sel.setBaseAndExtent(sel.focusNode, sel.focusOffset, end_node, end_offset) sel.setBaseAndExtent(sel.focusNode, sel.focusOffset, end_node, end_offset)
elif data.type is 'drag-scroll': elif dtype is 'drag-scroll':
self.scroll_to_extend_annotation(data.backwards) self.scroll_to_extend_annotation(data.backwards)
elif data.type is 'edit-highlight': elif dtype 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_ and select_crw(crw_): if crw_ and select_crw(crw_):
self.ensure_selection_visible() self.ensure_selection_visible()
window.setTimeout(def(): window.setTimeout(def():
self.send_message('annotations', type='edit-highlight') self.send_message('annotations', type='edit-highlight')
, 50) , 50)
elif data.type is 'notes-edited': elif dtype is 'notes-edited':
cls = 'crw-has-dot' cls = 'crw-has-dot'
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_:
@ -762,7 +763,7 @@ class IframeBoss:
node.classList.add(cls) node.classList.add(cls)
else: else:
node.classList.remove(cls) node.classList.remove(cls)
elif data.type is 'remove-highlight': elif dtype is 'remove-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_:
unwrap_crw(crw_) unwrap_crw(crw_)
@ -772,7 +773,7 @@ class IframeBoss:
# have to remove selection otherwise it remains as the empty # have to remove selection otherwise it remains as the empty
# string, and the selection bar does not hide itself # string, and the selection bar does not hide itself
sel.removeAllRanges() sel.removeAllRanges()
elif data.type is 'apply-highlight': elif dtype is 'apply-highlight':
sel = window.getSelection() sel = window.getSelection()
text = sel.toString() text = sel.toString()
if not sel.rangeCount: if not sel.rangeCount:
@ -808,7 +809,7 @@ class IframeBoss:
) )
reset_find_caches() reset_find_caches()
else: else:
console.log('Ignoring annotations message to iframe with unknown type: ' + data.type) console.log('Ignoring annotations message to iframe with unknown type: ' + dtype)
def apply_highlights_on_load(self, highlights): def apply_highlights_on_load(self, highlights):
clear_annot_id_uuid_map() clear_annot_id_uuid_map()