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

Content server: Fix auto full screen not working when continuing to read books with user account enabled. Fixes #2001880 [[Content Server] Not entering fullscreen automatically](https://bugs.launchpad.net/calibre/+bug/2001880)

Browse Source
This commit is contained in:
Kovid Goyal 2023-01-05 14:13:19 +05:30
parent f08b238986
commit 939e2a1237
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pyj/book_list/home.pyj
View File

@ -10,7 +10,7 @@ from book_list.globals import get_db
from book_list.library_data import (
all_libraries, last_virtual_library_for, sync_library_books
)
from book_list.router import open_book, open_book_url, update_window_title
from book_list.router import open_book, update_window_title
from book_list.top_bar import add_button, create_top_bar
from book_list.ui import set_default_panel_handler, show_panel
from dom import add_extra_css, build_rule, clear, ensure_id, set_css, unique_id
@ -51,8 +51,8 @@ def show_cover(blob, name, mt, book):
img.src = window.URL.createObjectURL(blob)
def read_book(library_id, book_id, fmt):
open_book(book_id, fmt, library_id)
def read_book(library_id, book_id, fmt, extra_query):
open_book(book_id, fmt, library_id, extra_query=extra_query)
def get_last_read_position(last_read_positions, prev_last_read):
@ -129,13 +129,15 @@ def show_recent_for_user(container_id):
container = document.getElementById(container_id)
images = prepare_recent_container(container)
for item in recently_read_by_user.items[:3]:
q = {'library_id': item.library_id}
q = {}
if item.cfi:
q.bookpos = item.cfi
url_to_read = open_book_url(item.book_id, item.format, q)
rb = read_book.bind(None, item.library_id, item.book_id, item.format, q)
img = E.img(alt=item.tooltip, src=absolute_path(f'get/cover/{item.book_id}/{item.library_id}'))
images.appendChild(E.div(style='margin: 0 1em',
E.a(title=item.tooltip, href=url_to_read, img)))
images.appendChild(E.div(
style='margin: 0 1em',
E.a(title=item.tooltip, href='javascript:void(0)', img, onclick=rb)
))
img.onerror = def(err):
failed = err.target
failed.parentNode.parentNode.style.display = 'none'
@ -160,7 +162,7 @@ def show_recent_stage2(books):
img_id = ensure_id(img)
images.appendChild(E.div(style='margin: 0 1em',
E.a(img, href='javascript: void(0)', title=img.alt,
onclick=read_book.bind(None, book.key[0], book.key[1], book.key[2])
onclick=read_book.bind(None, book.key[0], book.key[1], book.key[2], None)
),
))
if book.cover_name:

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

@ -56,7 +56,7 @@ def apply_url(ignore_handler):
handler(data)
def open_book(book_id, fmt, library_id=None, replace=False):
def request_full_screen_if_wanted():
opt = get_session_data().get('fullscreen_when_opening')
has_touch = v'"ontouchstart" in window'
at_left = window.screenLeft is 0
@ -65,8 +65,15 @@ def open_book(book_id, fmt, library_id=None, replace=False):
# Note that full screen requests only succeed if they are in response to a
# user action like clicking/tapping a button
request_full_screen()
def open_book(book_id, fmt, library_id=None, replace=False, extra_query=None):
request_full_screen_if_wanted()
library_id = library_id or current_library_id()
push_state({'book_id':book_id, 'fmt':fmt, 'library_id':library_id}, replace=replace, mode=read_book_mode)
q = {'book_id':book_id, 'fmt':fmt, 'library_id':library_id}
if extra_query and jstype(extra_query) is 'object':
Object.assign(q, extra_query)
push_state(q, replace=replace, mode=read_book_mode)
def open_book_url(book_id, fmt, extra_query):