kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-16 07:46:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix finding path of packaged archive and loading landing page

Browse Source
This commit is contained in:
Jaifroid 2024-01-06 17:20:39 +00:00
parent 7fc3f03d40
commit 988095fde5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/js/app.js
View File

@ -3194,10 +3194,10 @@ if (storages !== null && storages.length > 0 ||
var archiveFilePath = params.storedFilePath;
if (params.storedFile === params.packagedFile) {
// If the app is packed inside an asar archive, or is Electron running from localhost, we need to alter the archivePath to point outside the asar directory
if ((/\/app.asar\//.test(document.location.href) || window.fs && document.location.protocol === 'http:')) {
params.archivePath = params.archivePath.replace(/^(?:resources\/)?/, 'resources/');
if (electronAPI && electronAPI.__dirname) {
archiveFilePath = electronAPI.__dirname.replace(/[/\\]app\.asar/, '');
}
archiveFilePath = params.archivePath + '/' + params.packagedFile;
archiveFilePath = archiveFilePath + '/' + params.archivePath + '/' + params.packagedFile;
if (~params.storedFilePath.indexOf(archiveFilePath)) {
params.storedFilePath = archiveFilePath;
}
@ -6324,7 +6324,10 @@ function displayArticleContentInContainer (dirEntry, htmlArticle) {
loaded = false;
articleWindow.location.href = newLocation;
} else {
console.error('No Service Worker controller found while waiting for transformed HTML to be loaded!');
console.warn('No Service Worker controller found while waiting for transformed HTML to be loaded! Let\'s wait...');
setTimeout(function () {
document.getElementById('btnHome').click();
}, 1800);
}
}
return;