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

Workaround for over-encoded URLs in zimit2 #1229 (#1230)

Browse Source
This commit is contained in:
Jaifroid 2024-05-01 11:10:52 +02:00 committed by GitHub
parent c455850e1d
commit 85a9d82cbb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/js/app.js
View File

@ -2228,6 +2228,10 @@ function handleClickOnReplayLink (ev, anchor) {
} else { } else {
zimUrl = pseudoNamespace + pseudoDomainPath + anchor.search; zimUrl = pseudoNamespace + pseudoDomainPath + anchor.search;
} }
// It is necessary to fully decode zimit2, as these archives follow OpenZIM spec
if (params.zimType === 'zimit2') {
zimUrl = decodeURIComponent(zimUrl);
}
// We need to test the ZIM link // We need to test the ZIM link
if (zimUrl) { if (zimUrl) {
ev.preventDefault(); ev.preventDefault();
@ -2355,9 +2359,12 @@ function handleMessageChannelMessage (event) {
// We received a message from the ServiceWorker // We received a message from the ServiceWorker
// The ServiceWorker asks for some content // The ServiceWorker asks for some content
var title = event.data.title; var title = event.data.title;
if (selectedArchive.zimType === 'zimit') { if (appstate.isReplayWorkerAvailable) {
// Zimit ZIMs store assets with the querystring, so we need to add it! // Zimit ZIMs store assets with the querystring, so we need to add it. ReplayWorker handles encoding.
title = title + event.data.search; title = title + event.data.search;
} else if (params.zimType === 'zimit') {
// Zimit classic ZIMs store assets encoded with the querystring, so we need to add it
title = encodeURI(title) + event.data.search;
} }
var messagePort = event.ports[0]; var messagePort = event.ports[0];
var readFile = function (dirEntry) { var readFile = function (dirEntry) {