From c8e43dea704448d2ef721235bea070ee7c8b46a0 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Mon, 7 Jun 2021 06:48:27 +0100 Subject: [PATCH] Code updates # 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 --- www/js/app.js | 2 +- www/js/init.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/js/app.js b/www/js/app.js index 4122c9e4..4eb0fb70 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -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)) { diff --git a/www/js/init.js b/www/js/init.js index 30bd4828..e6a16f3a 100644 --- a/www/js/init.js +++ b/www/js/init.js @@ -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;