From 841c4fd24c90c78fcf18c5bd965ccacd9c1187bf Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Tue, 28 Sep 2021 06:16:53 +0100
Subject: [PATCH] Finalize info about map pins

Former-commit-id: 2d98f85d42adb9f275dd1af0e356609c26b2b320 [formerly 6e20d0cbe16ed811e8cae18862b6c57b9d5bb3ef] [formerly 3677cfb2ae14017537ad513da9c58ee707d8f1fc] [formerly b33ec746e68a71de08a0ca61475e55062b79805f [formerly 4f5ea5b517747d21397e24f86ff357641462960d [formerly aebbdf3720c9d6d5f5738b2664d536bf0213dbcd]]]
Former-commit-id: 235cd362c83235bda3ee617442dfda5ed5d204c6 [formerly 844062c46f95e57b5c5bb421cd5cf3b0d2492e48 [formerly f6707cf65fe7d489f650f757a1609ed5224e7936]]
Former-commit-id: 56662d202cca731e085ec8e73ff5f50287105a62 [formerly 2af0f6ec9898f282ffdaf68c174e7b064ea1fe1c]
Former-commit-id: a173222972ed01d00a22d4707b8acae30fa107d9
---
 www/index.html | 9 ++++++---
 www/js/app.js  | 7 +++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/www/index.html b/www/index.html
index b2519cbd..85c16b86 100644
--- a/www/index.html
+++ b/www/index.html
@@ -475,7 +475,10 @@
                         instead. With the Breakout link feature, the tab is non-browsable, but you can save the page to PDF or print it, etc., from that tab.
                     </p>
                     <p>
-                        Note that your browser's <b>popup blocker</b> may interfere with options that open new tabs or windows. When asked, enable popups always for the app (if you trust Kiwix), and then reload the app. 
+                        <b><i>Help! - when I click on an external link it gets blocked!</i></b> Don't panic, this is the Content Security Policy potecting you. You have probably activated Service Worker mode. To open
+                        external web sites, you need to turn on the option <b>Open links in a new tab</b> (in Service Worker mode). In JQuery mode, external links will open in a new tab/window regardliness of this
+                        setting. Additionally, please note that your browser's <b>popup blocker</b> may be interfering with options that open new tabs or windows. When asked, enable popups always for the app
+                        (if you trust Kiwix), and then reload the app. 
                     </p>
                     <p>
                         <b>PhET ZIMs:</b> These science and maths simulations only work in ServiceWorker mode. There is currently a bug which causes the experiment/ simulation to be shifted by several pixels, making
@@ -842,10 +845,10 @@
                                                 </div>
                                             </label>
                                         </div>
-                                        <label class="checkbox" id="openInNewTab" title="Opens articles in a new tab. In the UWP app (in ServiceWorker mode - see 'Expert settings' below), this also causes links to be parsed, which makes it possible to download EPUBs and PDFs from Gutenberg ZIMs, and possibly other ZIM types. This isn't necessary for the PWA app. N.B. This setting may interfere with some other ZIM types containing active content.">
+                                        <label class="checkbox" id="openInNewTab" title="Opens articles and external links in a new tab. In ServiceWorker mode (see 'Expert settings' below), this also causes links to be parsed, which (in the UWP app) makes it possible to download EPUBs and PDFs from Gutenberg ZIMs, and to open external links without them being blocked by the CSP. N.B. This setting may interfere with some other ZIM types containing active content.">
                                             <input type="checkbox" name="tabOpener" id="tabOpenerCheck">
                                             <span class="checkmark"></span>
-                                            <strong>Open ZIM links in new tab</strong> with right-click, ctrl-click, middle-click or long-press
+                                            <strong>Open links in a new tab</strong> with right-click, ctrl-click, middle-click or long-press
                                         </label>
                                         <div class="row" id="openInNewWindow" hidden>
                                             <div class="col-sm-6">
diff --git a/www/js/app.js b/www/js/app.js
index 0c9325fb..dae167a3 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -4325,14 +4325,13 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
                 } else if (regexpLocalAnchorHref.test(href)) {
                     // It's a local anchor link : remove escapedUrl if any (see above)
                     anchor.setAttribute('href', href.replace(/^[^#]*/, ''));
-                } else if (anchor.protocol !== currentProtocol ||
-                    anchor.host !== currentHost) {
+                } else if (anchor.protocol !== currentProtocol || anchor.host !== currentHost) {
                     // It's an external URL : we should open it in a new tab
                     anchor.target = '_blank';
                     if (anchor.protocol === 'bingmaps:') {
-                        anchor.removeAttribute('href');
                         anchor.removeAttribute('target');
-                        anchor.parentElement.addEventListener('click', function () {
+                        anchor.parentElement.addEventListener('click', function (e) {
+                            e.preventDefault();
                             window.location = href;
                         });
                     }