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

Embargo updates from Win7/8/8.1

Browse Source 
Fixes #593.

# Conflicts:
#	www/js/init.js
This commit is contained in:
Jaifroid 2024-05-14 08:57:13 +01:00
parent 67579ae54b
commit 9f8a1084ed
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/js/app.js
View File

@ -1013,14 +1013,17 @@ function checkUpdateServer () {
}); });
// Electron updates // Electron updates
if (window.electronAPI) { if (window.electronAPI) {
var electronVersion = navigator.userAgent.replace(/^.*Electron.([\d.]+).*/i, '$1');
var isUpdateableElectronVersion = !electronVersion.startsWith(params.win7ElectronVersion);
var baseApp = (params.packagedFile && /wikivoyage/.test(params.packagedFile)) ? 'wikivoyage' var baseApp = (params.packagedFile && /wikivoyage/.test(params.packagedFile)) ? 'wikivoyage'
: (params.packagedFile && /wikmed|mdwiki/.test(params.packagedFile)) ? 'wikimed' : (params.packagedFile && /wikmed|mdwiki/.test(params.packagedFile)) ? 'wikimed'
: 'electron'; : 'electron';
if (baseApp === 'electron') { if (baseApp === 'electron' && isUpdateableElectronVersion) {
console.log('Launching Electron auto-updater...'); console.log('Launching Electron auto-updater...');
electronAPI.checkForUpdates(); electronAPI.checkForUpdates();
} else { } else {
console.log('Auto-update: Packaged apps with large ZIM archives are not currently auto-updated.'); console.log('Auto-update: ' + (isUpdateableElectronVersion ? 'Packaged apps with large ZIM archives are not currently'
: 'Versions for Windows 7+ 32bit cannot be') + ' auto-updated.');
} }
} }
} }

1
www/js/init.js
View File

@ -66,6 +66,7 @@ params['cachedStartPages'] = {
// 'mdwiki_en_all_maxi': 'A/Wikipedia:WikiProject_Medicine/Open_Textbook_of_Medicine2', // 'mdwiki_en_all_maxi': 'A/Wikipedia:WikiProject_Medicine/Open_Textbook_of_Medicine2',
wikivoyage_en_all_maxi: 'A/Main_Page' wikivoyage_en_all_maxi: 'A/Main_Page'
}; };
params['win7ElectronVersion'] = '22.3'; // KEEP UP TO DATE!!! This is the last minor version to support Win 7/8/8.1. Auto-update is embargoed for values starting with this.
params['kiwixDownloadLink'] = 'https://download.kiwix.org/zim/'; // Include final slash params['kiwixDownloadLink'] = 'https://download.kiwix.org/zim/'; // Include final slash
params['kiwixHiddenDownloadLink'] = 'https://master.download.kiwix.org/zim/'; params['kiwixHiddenDownloadLink'] = 'https://master.download.kiwix.org/zim/';
/** ***** DEV: ENSURE SERVERS BELOW ARE LISTED IN package.appxmanifest ************/ /** ***** DEV: ENSURE SERVERS BELOW ARE LISTED IN package.appxmanifest ************/