From cac2d212c62173075197deb6d4a88954818c07cc Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Sun, 4 Sep 2022 17:16:45 +0400 Subject: [PATCH] Respecting the --nosearchbar option of kiwix-serve If `kiwix-serve` is run with the `--nosearchbar` option the toolbar is disabled (hidden) in its viewer. Note however that certain actions performed by the viewer merely with the purpose of keeping the toolbar up-to-date are still carried out. --- src/server/internalServer.cpp | 1 + static/skin/viewer.js | 10 ++++++++-- static/templates/viewer_settings.js | 1 + static/viewer.html | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index b1bb904e2..c2c40cf5a 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -723,6 +723,7 @@ std::unique_ptr InternalServer::handle_viewer_settings(const RequestCo } const kainjow::mustache::object data{ + {"enable_toolbar", m_withTaskbar ? "true" : "false" }, {"enable_link_blocking", m_blockExternalLinks ? "true" : "false" }, {"enable_library_button", m_withLibraryButton ? "true" : "false" } }; diff --git a/static/skin/viewer.js b/static/skin/viewer.js index 28f436e6b..0f70dfa92 100644 --- a/static/skin/viewer.js +++ b/static/skin/viewer.js @@ -384,12 +384,18 @@ function setupSuggestions() { } function setupViewer() { + setInterval(handle_visual_viewport_change, 0); + + const kiwixToolBarWrapper = document.getElementById('kiwixtoolbarwrapper'); + if ( ! viewerSettings.toolbarEnabled ) { + return; + } + + kiwixToolBarWrapper.style.display = 'block'; if ( ! viewerSettings.libraryButtonEnabled ) { document.getElementById("kiwix_serve_taskbar_library_button").remove(); } - handle_visual_viewport_change(); - setupSuggestions(); // cybook hack diff --git a/static/templates/viewer_settings.js b/static/templates/viewer_settings.js index 26922d393..0ccf6579f 100644 --- a/static/templates/viewer_settings.js +++ b/static/templates/viewer_settings.js @@ -1,4 +1,5 @@ const viewerSettings = { + toolbarEnabled: {{enable_toolbar}}, linkBlockingEnabled: {{enable_link_blocking}}, libraryButtonEnabled: {{enable_library_button}} } diff --git a/static/viewer.html b/static/viewer.html index 15838a906..74ab8814f 100644 --- a/static/viewer.html +++ b/static/viewer.html @@ -25,7 +25,7 @@ -
+