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

Code updates

Browse Source 
# Conflicts:
#	www/js/init.js


Former-commit-id: d0093dc4a17d4d3719d2e48c0e799593b419a52d [formerly 6768c181775fe414b08de0d66b6e8ccc17bf1716] [formerly 027a019fbe0811ef5c180cbe7b4e7196e859d3b7] [formerly 94ce42cfb3f47e240c8427614694c42e194ee667 [formerly 68b082df850275c7d5192dace5aa8fe0c7d65d49 [formerly 7e992ad1ef39fc90d1d6d7c81989650a867f863d]]]
Former-commit-id: fa73fc36bf315cb44e0c55aac5b1df4c57a92689 [formerly ec63281971fa38a07dd21771db2b34532b94ad7e [formerly 28ddeb602f1f8cc7b14babed051ee0b85cbf2d2b]]
Former-commit-id: b94405d0631b75829e9e5f5138f97497b74ccbc5 [formerly ffe048feb55c9118d035081ec9af2a39fd473bd0]
Former-commit-id: 45ebb2d42fd5eef30238a450664de3ae9f3c61f3
This commit is contained in:
Jaifroid 2021-06-07 06:48:27 +01:00
parent 590c01770f
commit c8e43dea70
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/js/app.js
View File

@ -2149,7 +2149,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
if (fileset.length) {
setLocalArchiveFromFileList(fileset);
} else {
console.error("The picked file could not be found in the selected folder!");
console.error("The picked file could not be found in the selected folder!\n" + params.pickedFile);
var archiveList = [];
for (i = 0; i < files.length; i++) {
if (/\.zima?a?$/i.test(files[i].name)) {

6
www/js/init.js
View File

@ -167,9 +167,9 @@ if (!/^http/i.test(window.location.protocol) && params.localUWPSettings &&
params.localUWPSettings.PWA_launch = 'fail';
if (launchArguments && typeof Windows.Storage !== 'undefined') {
// We have to ensure the PWA will have access to the file with which the app was launched
var futureAccessList = Windows.Storage.AccessCache.StorageApplicationPermissions.futureAccessList;
futureAccessList.addOrReplace(params.falFileToken, launchArguments.files[0]);
if (futureAccessList.containsItem(params.falFolderToken)) futureAccessList.remove(params.falFolderToken);
var fal = Windows.Storage.AccessCache.StorageApplicationPermissions.futureAccessList;
fal.addOrReplace(params.falFileToken, launchArguments.files[0]);
if (fal.containsItem(params.falFolderToken)) fal.remove(params.falFolderToken);
uriParams += '&lastSelectedArchive=' + encodeURIComponent(launchArguments.files[0].name);
}
window.location.href = params.PWAServer + 'www/index.html' + uriParams;