diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index 07bc77791..b1bb904e2 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -626,9 +626,7 @@ InternalServer::get_matching_if_none_match_etag(const RequestContext& r) const std::unique_ptr InternalServer::build_homepage(const RequestContext& request) { - auto data = get_default_data(); - data.set("enable_viewer", m_withTaskbar ? "true" : "false"); - return ContentResponse::build(*this, m_indexTemplateString, data, "text/html; charset=utf-8"); + return ContentResponse::build(*this, m_indexTemplateString, get_default_data(), "text/html; charset=utf-8"); } /** diff --git a/static/skin/index.js b/static/skin/index.js index 6bf46db68..7f29b316e 100644 --- a/static/skin/index.js +++ b/static/skin/index.js @@ -111,9 +111,7 @@ downloadLink = ''; } const bookName = link.split('/').pop(); - const viewerLink = enableViewer - ? `${root}/viewer#${bookName}` - : link; + const viewerLink = `${root}/viewer#${bookName}`; const humanFriendlyZimSize = humanFriendlySize(zimSize); diff --git a/static/templates/index.html b/static/templates/index.html index 61fd9f841..42bbc6a1b 100644 --- a/static/templates/index.html +++ b/static/templates/index.html @@ -32,7 +32,6 @@ - diff --git a/test/server.cpp b/test/server.cpp index 42290245e..d76b9c403 100644 --- a/test/server.cpp +++ b/test/server.cpp @@ -184,7 +184,7 @@ R"EXPECTEDRESULT( href="/ROOT/skin/index.css?cacheid=3b470cee" src: url("/ROOT/skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype"); - + )EXPECTEDRESULT" }, {