From 1b92f08e7fd3e43712885340a32dcdb55d4e22e5 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Sun, 6 Feb 2022 14:37:32 +0000 Subject: [PATCH] Fix erroneous load of SW mode Former-commit-id: 90eda0fb8d6779a2060ee5e64d4b34fd7e5b9227 [formerly 7539b651730902854a7a990ac7130668624878e7] [formerly 9afde634e00173aa52fd1293f7a42069accf8e07] [formerly c36916f7d91626583a358eff739044e91ace3499 [formerly de035ad70da0bd2fab67d87a2bba05d207cec3ef [formerly b839242f295fc0b0d041c3a0343d9d3d6e28c38e]]] Former-commit-id: e8d979d965749c0ef67a596396a7746afe8c9c70 [formerly 22c6da93f9401ffa5514c17cb63f1cd19ee3f72a [formerly 41906e113ce99774073c90c3b45ae69c3b85899f]] Former-commit-id: d7b17395f1b1d2f9b7c26fe74dd041a900d40cbd [formerly f74822a6856bfa5a50cf71fd6665170d3a34bbbe] Former-commit-id: e5b28a5a44ecf7d5157b26f42bc974c06491c9da --- www/index.html | 2 +- www/js/init.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/index.html b/www/index.html index b0ac3ca9..78b3378a 100644 --- a/www/index.html +++ b/www/index.html @@ -74,7 +74,7 @@ }).then(function (reg) { console.log("Service Worker has been registered for scope: " + reg.scope); }).catch(function (err) { - console.err('Service Worker could not be registered', err); + console.error('Service Worker could not be registered', err); }); } } else { diff --git a/www/js/init.js b/www/js/init.js index ed48e057..06b3761c 100644 --- a/www/js/init.js +++ b/www/js/init.js @@ -95,8 +95,8 @@ params['hideActiveContentWarning'] = getSetting('hideActiveContentWarning') != n params['allowHTMLExtraction'] = getSetting('allowHTMLExtraction') == true; params['alphaChar'] = getSetting('alphaChar') || 'A'; //Set default start of alphabet string (used by the Archive Index) params['omegaChar'] = getSetting('omegaChar') || 'Z'; //Set default end of alphabet string -params['contentInjectionMode'] = getSetting('contentInjectionMode') || (navigator.serviceWorker && !/^(ms-appx-web:)$/i.test(window.location.protocol) - && !/Android/.test(params.appType) ? 'serviceworker' : 'jquery'); // Deafault to SW mode if the browser supports it +params['contentInjectionMode'] = getSetting('contentInjectionMode') || ((navigator.serviceWorker && !/^(ms-appx-web:)$/i.test(window.location.protocol) + && !/Android/.test(params.appType)) ? 'serviceworker' : 'jquery'); // Deafault to SW mode if the browser supports it params['allowInternetAccess'] = getSetting('allowInternetAccess'); params['windowOpener'] = getSetting('windowOpener'); // 'tab|window|false' A setting that determines whether right-click/long-press of a ZIM link opens a new window/tab params['rightClickType'] = getSetting('rightClickType'); // 'single|double|false' A setting that determines whether a single or double right-click is used to open a new window/tab