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

Viewer: Fix error when trying to change more than a single keyboard shortcut at once. Fixes #1858117 [ERROR: Unhandled error: Uncaught TypeError when setting custom keyboard shortcut in viewer](https://bugs.launchpad.net/calibre/+bug/1858117)

Browse Source
This commit is contained in:
Kovid Goyal 2020-01-02 22:13:36 +05:30
parent ecdf7f74e0
commit fc8659e07a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pyj/read_book/prefs/keyboard.pyj
View File

@ -84,7 +84,7 @@ def close_customize_shortcut(apply_changes):
item.dataset.userData = JSON.stringify(q) item.dataset.userData = JSON.stringify(q)
break break
get_container().dataset.changed = 'true' get_container().dataset.changed = 'true'
commit_keyboard(create_keyboard_panel.onchange) commit_keyboard(create_keyboard_panel.onchange, None)
def add_key_widget(): def add_key_widget():
@ -184,7 +184,7 @@ def shortcuts_differ(a, b):
return False return False
def commit_keyboard(onchange): def commit_keyboard(onchange, container):
sd = get_session_data() sd = get_session_data()
vals = {} vals = {}
for item in get_container().querySelectorAll('[data-user-data]'): for item in get_container().querySelectorAll('[data-user-data]'):
@ -192,6 +192,7 @@ def commit_keyboard(onchange):
if shortcuts_differ(q.shortcuts, shortcuts_definition()[q.name].shortcuts): if shortcuts_differ(q.shortcuts, shortcuts_definition()[q.name].shortcuts):
vals[q.name] = q.shortcuts vals[q.name] = q.shortcuts
sd.set('keyboard_shortcuts', vals) sd.set('keyboard_shortcuts', vals)
if container is not None:
create_keyboard_panel.onchange = None create_keyboard_panel.onchange = None
if get_container().dataset.changed is 'true': if get_container().dataset.changed is 'true':
onchange() onchange()