Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Server: When returning to the search page, remember the last used state of the Tag browser

Browse Source
This commit is contained in:
Kovid Goyal 2017-07-11 17:58:40 +05:30
parent 893b72f0ab
commit 21b716d7aa
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pyj/book_list/search.pyj
View File

@ -50,6 +50,7 @@ add_extra_css(def():
) )
state = {} state = {}
last_accepted_search = None
def component(container, name): def component(container, name):
return container.querySelector(f'[data-component="{name}"]') return container.querySelector(f'[data-component="{name}"]')
@ -70,10 +71,13 @@ def node_for_path(path):
def execute_search(text): def execute_search(text):
nonlocal last_accepted_search
if not text: if not text:
container = document.getElementById(state.container_id) container = document.getElementById(state.container_id)
search_control = container.querySelector('input[name="search-books"]') search_control = container.querySelector('input[name="search-books"]')
text = search_control.value or '' text = search_control.value or ''
if state.tag_path and state.tag_path.length:
last_accepted_search = {'library_id': current_library_id(), 'vl': current_virtual_library(), 'tag_path': list(state.tag_path)}
apply_search(text) apply_search(text)
@ -307,7 +311,13 @@ def render_tag_browser():
container = document.getElementById(state.container_id).lastChild.lastChild container = document.getElementById(state.container_id).lastChild.lastChild
clear(container) clear(container)
set_css(container, padding='1ex 1em', display='flex', flex_wrap='wrap', margin_left='-0.5rem') set_css(container, padding='1ex 1em', display='flex', flex_wrap='wrap', margin_left='-0.5rem')
render_children(container, node_for_path().children) try:
node = node_for_path()
except:
# If a saved tag_path is no longer valid
state.tag_path = []
node = node_for_path()
render_children(container, node.children)
render_breadcrumbs() render_breadcrumbs()
@ -347,6 +357,9 @@ def on_data_fetched(end_type, xhr, ev):
state.node_id_map = {} state.node_id_map = {}
state.active_nodes = {} state.active_nodes = {}
process_node(state.tag_browser_data, tag_browser_data.item_map) process_node(state.tag_browser_data, tag_browser_data.item_map)
if last_accepted_search and last_accepted_search.library_id is current_library_id() and last_accepted_search.vl is current_virtual_library():
if last_accepted_search.tag_path.length:
state.tag_path = list(last_accepted_search.tag_path)
render_tag_browser() render_tag_browser()
else: else:
show_error(xhr.error_html) show_error(xhr.error_html)