From fd178ed81fa66ede3066bed7fda0b7ca34426530 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 1 Feb 2017 08:49:28 +0530
Subject: [PATCH] ...

---
 src/pyj/book_list/home.pyj  |  2 +-
 src/pyj/book_list/views.pyj | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pyj/book_list/home.pyj b/src/pyj/book_list/home.pyj
index 129f952c3f..beaa881b76 100644
--- a/src/pyj/book_list/home.pyj
+++ b/src/pyj/book_list/home.pyj
@@ -42,7 +42,7 @@ def init(container_id):
         library_name = interface_data.library_map[library_id]
         if library_name:
             cl.appendChild(E.div(E.a(library_name, href='javascript: void(0)', title=library_name, data_lid=library_id, onclick=def(ev):
-                lib_id = ev.currentTarget.dataSet.lid
+                lib_id = ev.currentTarget.dataset.lid
                 show_panel('book_list', {'library_id': lib_id})
             )))
 
diff --git a/src/pyj/book_list/views.pyj b/src/pyj/book_list/views.pyj
index 660379996b..794af4e22e 100644
--- a/src/pyj/book_list/views.pyj
+++ b/src/pyj/book_list/views.pyj
@@ -8,11 +8,14 @@ from dom import set_css, add_extra_css
 from elementmaker import E
 from gettext import gettext as _
 from modals import error_dialog, ajax_progress_dialog
+from utils import conditional_timeout
+from session import get_interface_data
 
 from book_list.globals import get_session_data
 from book_list.cover_grid import cover_grid_css, create_item as create_cover_grid_item, init as init_cover_grid, append_item as cover_grid_append_item
 from book_list.top_bar import create_top_bar
 from book_list.ui import back, set_panel_handler
+from book_list.library_data import current_library_id, load_status
 from widgets import create_button, create_spinner
 
 COVER_GRID_CLASS = 'book-list-cover-grid'
@@ -22,8 +25,19 @@ add_extra_css(def():
     return ans
 )
 
+def check_for_books_loaded():
+    container = this
+    if load_status.loading:
+        conditional_timeout(container.id, 5, check_for_books_loaded)
+        return
+
+
 def init(container_id):
     create_top_bar(container_id, title=_('Books'), action=back, icon='close')
+    container = document.getElementById(container_id)
+    lid = container.dataset.library_id = current_library_id()
+    container.appendChild(E.div(_('Loading books from the {} calibre library, please wait...').format(get_interface_data().library_map[lid]), style='margin: 1ex 1em'))
+    conditional_timeout(container_id, 5, check_for_books_loaded)
 
 
 set_panel_handler('book_list', init)