From 93264f7409beae1a701a59c07890b14299359af9 Mon Sep 17 00:00:00 2001 From: Manan Jethwani Date: Tue, 23 Mar 2021 03:17:14 +0530 Subject: [PATCH] added root functionality for block external link feature --- src/server/response.cpp | 4 ++-- static/skin/block_external.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/response.cpp b/src/server/response.cpp index cb0d82304..2aa4aee95 100644 --- a/src/server/response.cpp +++ b/src/server/response.cpp @@ -221,9 +221,9 @@ void ContentResponse::inject_externallinks_blocker() kainjow::mustache::data data; data.set("root", m_root); auto script_tag = render_template(RESOURCE::templates::external_blocker_part_html, data); - m_content = appendToFirstOccurence( + m_content = prependToFirstOccurence( m_content, - "", + "", script_tag); } diff --git a/static/skin/block_external.js b/static/skin/block_external.js index b6e9aa55b..6bc32baec 100644 --- a/static/skin/block_external.js +++ b/static/skin/block_external.js @@ -1,5 +1,6 @@ +const root = document.querySelector( `link[type='root']` ).getAttribute("href"); // `block_path` variable used by openzim/warc2zim to detect whether URL blocking is enabled or not -var block_path = "/catch/external"; +var block_path = `${root}/catch/external`; // called only on external links function capture_event(e, target) { target.setAttribute("href", encodeURI(block_path + "?source=" + target.href)); }