kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-16 07:46:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

New attempt to prevent rogue iframe hiding

Browse Source 
Former-commit-id: 02db3ca825e59142ca010479d3ee741b83fb7b35 [formerly aba5699efaddb05832bbd2761df756e8d87f81c1] [formerly d133737bbd4841e2a9484c09beffcc3c6201eaee] [formerly 533e5bbeb4f58ee30493c8471c3c7d680999f300 [formerly 48bd548fadc00a610b4d9fe46af453ad3347c4ae [formerly 01b605c5274ab2b8fc5419955ba2dfe5fe615b68]]]
Former-commit-id: cd09ac4a888b994f1c82ba98cf327b2fcbc6cb2f [formerly bb6deceae13c9755e590126884d98b92625ae78e [formerly 6cffde041e2589005c80498230d94b8de7d8adf2]]
Former-commit-id: 415c4d92f2a6abecb2a089fd733f7e7d58e91363 [formerly 34202d1a7a71d0a084d1ae0faf9f458084b6fc8b]
Former-commit-id: c246d8373b0f4aa54007867e88a739766927e702
This commit is contained in:
Jaifroid 2022-01-18 00:44:36 +00:00
parent fdc5c1459f
commit 085a237fe9
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
www/js/app.js
View File

@ -3669,20 +3669,19 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
// hidden). Note that testing appstate.target is probably redundant for UWP because it will always // hidden). Note that testing appstate.target is probably redundant for UWP because it will always
// be iframe even if an external window is loaded... (but we probably need to do so for other cases) // be iframe even if an external window is loaded... (but we probably need to do so for other cases)
if (appstate.target === 'iframe') articleContainer.style.display = 'none'; if (appstate.target === 'iframe') articleContainer.style.display = 'none';
articleContainer.onload = function() { // articleContainer.onload = function() {
articleLoadedSW(thisDirEntry); // articleLoadedSW(thisDirEntry);
}; // };
// New windows do not respect the onload event because they've been pre-populated, // New windows do not respect the onload event because they've been pre-populated,
// so we have to simulate this event (note potential for race condition if timeout is too short) // so we have to simulate this event (note potential for race condition if timeout is too short)
// NB The UWP app cannot control the opened window, so it can only be controlled by the Service Worker // NB The UWP app cannot control the opened window, so it can only be controlled by the Service Worker
if (/UWP/.test(params.appType)) { setTimeout(function () {
setTimeout(function () { if (appstate.target === 'iframe') articleContainer.style.display = 'block';
articleContainer.style.display = 'block'; }, 800);
}, 800); setTimeout(function () {
setTimeout(function () { $("#searchingArticles").hide();
$("#searchingArticles").hide(); }, 2000);
}, 2000); if (!/UWP/.test(params.appType)) {
} else {
setTimeout(function () { setTimeout(function () {
if (!loaded) articleLoadedSW(thisDirEntry); if (!loaded) articleLoadedSW(thisDirEntry);
}, 400); }, 400);
@ -3721,7 +3720,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
} else { } else {
messagePort.postMessage(message); messagePort.postMessage(message);
} }
} };
// Let's read the content in the ZIM file // Let's read the content in the ZIM file
if (/^(?:file:|chrome-extension)/i.test(window.location.protocol)) { if (/^(?:file:|chrome-extension)/i.test(window.location.protocol)) {
// For Electron apps or Chrome extension, we have to access the cache app-side instead of SW-side // For Electron apps or Chrome extension, we have to access the cache app-side instead of SW-side