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

Fix critical error detecting window.electronAPI

Browse Source
This commit is contained in:
Jaifroid 2024-05-14 17:08:47 +01:00
parent 9f7b379adc
commit 1ea0155845
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/js/app.js
View File

@ -979,7 +979,7 @@ if (window.electronAPI) {
// Check for GitHub and Electron updates // Check for GitHub and Electron updates
var updateCheck = document.getElementById('updateCheck'); var updateCheck = document.getElementById('updateCheck');
params.isUWPStoreApp = /UWP/.test(params.appType) && Windows.ApplicationModel && Windows.ApplicationModel.Package && params.isUWPStoreApp = /UWP/.test(params.appType) && Windows.ApplicationModel && Windows.ApplicationModel.Package &&
!/Association.Kiwix/.test(Windows.ApplicationModel.Package.current.id.publisher) || window.electronAPI && electronAPI.isMicrosoftStoreApp; !/Association.Kiwix/.test(Windows.ApplicationModel.Package.current.id.publisher) || window.electronAPI && window.electronAPI.isMicrosoftStoreApp;
// If Internet access is allowed, or it's a UWP Store app, or it's HTML5 (i.e., not Electron/NWJS or UWP) ... // If Internet access is allowed, or it's a UWP Store app, or it's HTML5 (i.e., not Electron/NWJS or UWP) ...
if (params.allowInternetAccess || params.isUWPStoreApp || /HTML5/.test(params.appType)) { if (params.allowInternetAccess || params.isUWPStoreApp || /HTML5/.test(params.appType)) {
updateCheck.style.display = 'none'; // ... hide the update check link updateCheck.style.display = 'none'; // ... hide the update check link
@ -3290,7 +3290,7 @@ if (storages !== null && storages.length > 0 ||
var archiveFilePath = params.storedFilePath; var archiveFilePath = params.storedFilePath;
if (params.storedFile === params.packagedFile) { 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 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 (electronAPI && electronAPI.__dirname) { if (window.electronAPI && window.electronAPI.__dirname) {
archiveFilePath = electronAPI.__dirname.replace(/[/\\]app\.asar/, ''); archiveFilePath = electronAPI.__dirname.replace(/[/\\]app\.asar/, '');
} }
archiveFilePath = archiveFilePath + '/' + params.archivePath + '/' + params.packagedFile; archiveFilePath = archiveFilePath + '/' + params.archivePath + '/' + params.packagedFile;
@ -4343,7 +4343,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
!(electronAPI && archive.file._files[0].path.indexOf(electronAPI.__dirname.replace(/[\\/]+(?:app\.asar)?$/, '') + '/' + params.archivePath) === 0)) { !(window.electronAPI && archive.file._files[0].path.indexOf(electronAPI.__dirname.replace(/[\\/]+(?:app\.asar)?$/, '') + '/' + params.archivePath) === 0)) {
verifyLoadedArchive(archive).then(function () { verifyLoadedArchive(archive).then(function () {
displayArchive(); displayArchive();
}); });
@ -4374,7 +4374,7 @@ function loadPackagedArchive () {
// because a new path is established each time the image's filesystem is mounted. So we reset to default. // because a new path is established each time the image's filesystem is mounted. So we reset to default.
var archiveFilePrefix = params.storedFilePath; var archiveFilePrefix = params.storedFilePath;
// 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 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 (electronAPI && electronAPI.__dirname) { if (window.electronAPI && window.electronAPI.__dirname) {
archiveFilePrefix = electronAPI.__dirname.replace(/[/\\]app\.asar/, ''); archiveFilePrefix = electronAPI.__dirname.replace(/[/\\]app\.asar/, '');
} }
var archiveDirectory = archiveFilePrefix + '/' + params.archivePath + '/' + params.packagedFile; var archiveDirectory = archiveFilePrefix + '/' + params.archivePath + '/' + params.packagedFile;