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

Get rid of the last remaining use of book_list.get_boss

Browse Source
This commit is contained in:
Kovid Goyal 2017-02-15 20:31:19 +05:30
parent a5f1427ca3
commit c80ff1d42a
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pyj/book_list/router.pyj
View File

@ -82,3 +82,6 @@ def back():
else: else:
q = {} q = {}
push_state(q, replace=True) push_state(q, replace=True)
def home(replace=False):
push_state({})

17
src/pyj/read_book/overlay.pyj
View File

@ -5,7 +5,8 @@ from __python__ import hash_literals, bound_methods
from dom import clear, set_css, unique_id, svgicon, build_rule, add_extra_css from dom import clear, set_css, unique_id, svgicon, build_rule, add_extra_css
from elementmaker import E from elementmaker import E
from book_list.theme import get_color from book_list.theme import get_color
from book_list.globals import get_boss from book_list.globals import get_read_ui
from book_list.router import home
from widgets import create_spinner, create_button from widgets import create_spinner, create_button
from gettext import gettext as _ from gettext import gettext as _
from read_book.toc import create_toc_panel from read_book.toc import create_toc_panel
@ -85,11 +86,10 @@ class DeleteBook: # {{{
if errmsg: if errmsg:
view.ui.show_error(_('Failed to delete book'), _('Failed to delete book from local storage, click "Show details" for more information.'), errmsg) view.ui.show_error(_('Failed to delete book'), _('Failed to delete book from local storage, click "Show details" for more information.'), errmsg)
else: else:
book_id = book.key[1]
if self.reload_book: if self.reload_book:
get_boss().reload_book() get_read_ui().reload_book()
else: else:
get_boss().return_to_book_list(book_id) home()
) )
def cancel(self): def cancel(self):
@ -150,7 +150,7 @@ class MainOverlay:
E.div( # actions E.div( # actions
E.ul( E.ul(
ac(_('Home'), _('Return to list of books'), self.return_to_book_list, 'home'), ac(_('Home'), _('Return to list of books'), def(): home();, 'home'),
ac(_('Back'), None, self.back, 'arrow-left'), ac(_('Back'), None, self.back, 'arrow-left'),
ac(_('Forward'), None, self.forward, 'arrow-right'), ac(_('Forward'), None, self.forward, 'arrow-right'),
), ),
@ -203,11 +203,6 @@ class MainOverlay:
clearInterval(self.timer) clearInterval(self.timer)
self.timer = None self.timer = None
def return_to_book_list(self):
view = self.overlay.view
book_id = view.book.key[1]
get_boss().return_to_book_list(book_id)
def back(self): def back(self):
window.history.back() window.history.back()
@ -260,7 +255,7 @@ class PrefsOverlay: # {{{
def on_hide(self): def on_hide(self):
if self.changes_occurred: if self.changes_occurred:
self.changes_occurred = False self.changes_occurred = False
get_boss().redisplay_book() get_read_ui().redisplay_book()
# }}} # }}}