kiwix/kiwix-js
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js.git synced 2025-09-23 04:28:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix opening of new Zimit tabs to local articles and PDFs (#1176)

Browse Source
This commit is contained in:
Jaifroid 2023-12-03 14:35:15 +00:00 committed by GitHub
parent f68fa0ba83
commit 34239163af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/js/app.js
View File

@ -2022,8 +2022,11 @@ function handleClickOnReplayLink (ev, anchor) {
var pseudoNamespace = selectedArchive.zimitPrefix.replace(/^(.*\/)[^/]{2,}\/$/, '$1'); var pseudoNamespace = selectedArchive.zimitPrefix.replace(/^(.*\/)[^/]{2,}\/$/, '$1');
var pseudoDomainPath = anchor.hostname + anchor.pathname; var pseudoDomainPath = anchor.hostname + anchor.pathname;
var containingDocDomainPath = anchor.ownerDocument.location.hostname + anchor.ownerDocument.location.pathname; var containingDocDomainPath = anchor.ownerDocument.location.hostname + anchor.ownerDocument.location.pathname;
// If the paths are identical, then we are dealing with a link to an anchor in the same document, so we can return // If it's for a different protocol (e.g. javascript:) we should let Replay handle that, or if the paths are identical, then we are dealing
if (anchor.protocol !== document.location.protocol || pseudoDomainPath === containingDocDomainPath) return; // with a link to an anchor in the same document, or if the user has pressed the ctrl or command key, the document will open in a new window
// anyway, so we can return. Note that some PDFs are served with a protocol of http: instead of https:, so we need to account for that.
if (anchor.protocol.replace(/s:/, ':') !== document.location.protocol.replace(/s:/, ':') || pseudoDomainPath === containingDocDomainPath ||
ev.ctrlKey || ev.metaKey || ev.button === 1) return;
var zimUrl = pseudoNamespace + pseudoDomainPath + anchor.search; var zimUrl = pseudoNamespace + pseudoDomainPath + anchor.search;
// We are dealing with a ZIM link transformed by Wombat, so we need to reconstruct the ZIM link // We are dealing with a ZIM link transformed by Wombat, so we need to reconstruct the ZIM link
if (zimUrl) { if (zimUrl) {
@ -2031,11 +2034,12 @@ function handleClickOnReplayLink (ev, anchor) {
ev.stopPropagation(); ev.stopPropagation();
selectedArchive.getDirEntryByPath(zimUrl).then(function (dirEntry) { selectedArchive.getDirEntryByPath(zimUrl).then(function (dirEntry) {
if (dirEntry) { if (dirEntry) {
var pathToArticleDocumentRoot = document.location.href.replace(/www\/index\.html.*$/, selectedArchive.file.name + '/');
var mimetype = dirEntry.getMimetype(); var mimetype = dirEntry.getMimetype();
// Due to the iframe sandbox, we have to prevent the PDF viewer from opening in the iframe and instead open it in a new tab // Due to the iframe sandbox, we have to prevent the PDF viewer from opening in the iframe and instead open it in a new tab
// Note that some Replay PDFs have html mimetypes, or can be redirects to PDFs, we need to check the URL as well // Note that some Replay PDFs have html mimetypes, or can be redirects to PDFs, we need to check the URL as well
if (/pdf/i.test(mimetype) || /\.pdf(?:[#?]|$)/i.test(anchor.href)) { if (/pdf/i.test(mimetype) || /\.pdf(?:[#?]|$)/i.test(anchor.href) || /\.pdf(?:[#?]|$)/i.test(dirEntry.url)) {
window.open(anchor.href, '_blank'); window.open(pathToArticleDocumentRoot + zimUrl, '_blank');
/* /*
} else if (/\bx?html\b/i.test(mimetype)) { } else if (/\bx?html\b/i.test(mimetype)) {
// If the SW has gone to sleep, loading this way gives it a chance to reload configuration // If the SW has gone to sleep, loading this way gives it a chance to reload configuration
@ -2044,9 +2048,9 @@ function handleClickOnReplayLink (ev, anchor) {
} else { } else {
// Fingers crossed, let Replay handle this link // Fingers crossed, let Replay handle this link
anchor.passthrough = true; anchor.passthrough = true;
// Handle middle-clicks and ctrl-clicks // Handle middle-clicks and ctrl-clicks (these should be filtered out above, but...)
if (ev.ctrlKey || ev.metaKey || ev.button === 1) { if (ev.ctrlKey || ev.metaKey || ev.button === 1) {
window.open(anchor.href, '_blank'); window.open(pathToArticleDocumentRoot + zimUrl, '_blank');
} else { } else {
anchor.click(); anchor.click();
} }