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

Fix Go to... not working

Browse Source
This commit is contained in:
Kovid Goyal 2017-01-01 20:51:07 +05:30
parent fd0e98f993
commit d8f8788f34
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pyj/read_book/goto.pyj
View File

@ -18,9 +18,9 @@ def create_goto_list(onclick):
id_map = get_toc_maps(toc)[1] id_map = get_toc_maps(toc)[1]
before, after = get_border_nodes(toc, id_map) before, after = get_border_nodes(toc, id_map)
if after: if after:
items.push(create_item(_('Next Section'), icon='caret-right', subtitle=after.title, action=onclick.bind(after.dest, after.frag))) items.push(create_item(_('Next Section'), icon='caret-right', subtitle=after.title, action=onclick.bind(None, after.dest, after.frag)))
if before: if before:
items.push(create_item(_('Previous Section'), icon='caret-left', subtitle=before.title, action=onclick.bind(before.dest, before.frag))) items.push(create_item(_('Previous Section'), icon='caret-left', subtitle=before.title, action=onclick.bind(None, before.dest, before.frag)))
build_list(ans, items) build_list(ans, items)
return ans return ans

2
src/pyj/read_book/toc.pyj
View File

@ -50,7 +50,7 @@ def get_border_nodes(toc, id_map):
nonlocal prev, before, after nonlocal prev, before, after
if node.dest: if node.dest:
if spine_before[node.dest]: if spine_before[node.dest]:
prev = node.dest prev = node
elif spine_after[node.dest]: elif spine_after[node.dest]:
if not before: if not before:
before = prev before = prev

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

@ -6,7 +6,7 @@ from book_list.globals import get_session_data, get_boss
from dom import set_css, add_extra_css, build_rule, svgicon from dom import set_css, add_extra_css, build_rule, svgicon
from elementmaker import E from elementmaker import E
from gettext import gettext as _ from gettext import gettext as _
from read_book.globals import messenger, iframe_id, current_book from read_book.globals import messenger, iframe_id, current_book, set_current_spine_item
from read_book.resources import load_resources from read_book.resources import load_resources
from read_book.overlay import Overlay from read_book.overlay import Overlay
from read_book.prefs.colors import resolve_color_scheme from read_book.prefs.colors import resolve_color_scheme
@ -269,6 +269,7 @@ class View:
self.show_loading() self.show_loading()
spine = self.book.manifest.spine spine = self.book.manifest.spine
idx = spine.indexOf(name) idx = spine.indexOf(name)
set_current_spine_item(name)
if idx > -1: if idx > -1:
self.currently_showing.bookpos = 'epubcfi(/{})'.format(2 * (idx +1)) self.currently_showing.bookpos = 'epubcfi(/{})'.format(2 * (idx +1))
self.set_margins() self.set_margins()