kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-08-04 03:48:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better loading logic for latest Electron

Browse Source
This commit is contained in:
Jaifroid 2025-07-28 18:07:32 +03:00
parent 88497964ce
commit 8ae0712e6b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/js/app.js
View File

@ -3736,8 +3736,12 @@ function setLocalArchiveFromArchiveList (archive) {
console.error(err); console.error(err);
}); });
} else { } else {
// If we are here, it means that the user has not selected a file or folder
// or else that a user gesture is needed to access the file system (this happens with recent versions of Electron)
if (!window.fs) {
uiUtil.systemAlert('We could not find the location of the file ' + archive + uiUtil.systemAlert('We could not find the location of the file ' + archive +
'. This can happen if you dragged and dropped a file into the app. Please use the file or folder pickers instead.'); '. This can happen if you dragged and dropped a file into the app. Please use the file or folder pickers instead.');
}
if (document.getElementById('configuration').style.display === 'none') { if (document.getElementById('configuration').style.display === 'none') {
document.getElementById('btnConfigure').click(); document.getElementById('btnConfigure').click();
} }
@ -4511,7 +4515,7 @@ function archiveReadyCallback (archive) {
// Check if source of the zim file can be trusted and that it is not a packaged archive // Check if source of the zim file can be trusted and that it is not a packaged archive
if (!settingsStore.getItem('trustedZimFiles').includes(archive.file.name) && archive.file._files[0].name !== params.packagedFile && if (!settingsStore.getItem('trustedZimFiles').includes(archive.file.name) && archive.file._files[0].name !== params.packagedFile &&
// And it's not an Electron-accessed file inside the app's package // And it's not an Electron-accessed file inside the app's package
!(window.electronAPI && archive.file._files[0].path.indexOf(electronAPI.__dirname.replace(/[\\/]+(?:app\.asar)?$/, '') + '/' + params.archivePath) === 0)) { !(window.electronAPI && archive.file._files[0].path && archive.file._files[0].path.indexOf(electronAPI.__dirname.replace(/[\\/]+(?:app\.asar)?$/, '') + '/' + params.archivePath) === 0)) {
verifyLoadedArchive(archive).then(function () { verifyLoadedArchive(archive).then(function () {
displayArchive(); displayArchive();
}); });