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

Fix detached arrayBuffer and use more standard hide-show

Browse Source 
Former-commit-id: 617db645be200efa1e8076df33b7991e9103f0e4 [formerly f52efb7eb88c931f44aade75b660b306854e9533] [formerly 4119ef5f9fa22eef5435a57395f34d9bf1b34b48] [formerly f3829dd2e79085b29f1f0b5be5272bd01a0488fa [formerly 0c423cc5f8fbad8fe87fd6fee4f2ef6223d6b631 [formerly 17db47b3e4be95fca5409df0415e6db295c6f9c7]]]
Former-commit-id: e237bf67213b0325bc53958c814539a76222c889 [formerly 53f3312704225274627889627b60458c6bb88638 [formerly d5286639157fd1d787facfed43f073d9a4e5a93c]]
Former-commit-id: adfab7abb07134030b313508a1a6606f01ad6027 [formerly 13106604ff8b2c33f3ad189a0c46c42bd1d8677a]
Former-commit-id: 66a597453a6cbd37876a21a845f08e1f3b52b42d
This commit is contained in:
Jaifroid 2022-01-30 19:50:37 +00:00
parent 9c5ca4021f
commit aa3c09894c
1 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
www/js/app.js
View File

@ -3574,7 +3574,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
setTimeout(function() {
articleDocument.bgcolor = '';
if (appstate.target === 'iframe') articleContainer.style.display = 'block';
docBody.hidden = false;
docBody.style.display = 'block';
}, 30);
settingsStore.removeItem('lastPageLoad');
uiUtil.clearSpinner();
@ -3679,50 +3679,30 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
}
return;
}
var sendContentToSW = function (content) {
var cacheKey = appstate.selectedArchive._file.name + '/' + title;
cache.getItemFromCacheOrZIM(appstate.selectedArchive, cacheKey, dirEntry).then(function (content) {
console.log('SW read binary file for: ' + dirEntry.url);
if (/\b(css|javascript|video|vtt|webm)\b/i.test(mimetype)) {
var shortTitle = dirEntry.url.replace(/[^/]+\//g, '').substring(0, 18);
uiUtil.pollSpinner('Getting ' + shortTitle + '...');
}
// Let's send the content to the ServiceWorker
var buffer = content.buffer ? content.buffer : content;
var message = {
'action': 'giveContent',
'title': title,
'mimetype': mimetype,
'imageDisplay': imageDisplayMode,
'content': content.buffer ? content.buffer : content
'content': buffer
};
clearTimeout(spinnerTimer);
spinnerTimer = setTimeout(uiUtil.clearSpinner, 2000);
if (content.buffer) {
messagePort.postMessage(message, [content.buffer]);
messagePort.postMessage(message, buffer);
} else {
messagePort.postMessage(message);
}
};
var cacheKey = appstate.selectedArchive._file.name + '/' + title;
cache.getItemFromCacheOrZIM(appstate.selectedArchive, cacheKey, dirEntry).then(sendContentToSW);
// Let's read the content in the ZIM file
// 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
// var cacheKey = appstate.selectedArchive._file.name + '/' + title;
// cache.getItemFromCacheOrZIM(appstate.selectedArchive, cacheKey, dirEntry).then(sendContentToSW);
// } else {
// if (/html$/.test(mimetype)) {
// uiUitl.pollSpinner();
// }
// console.debug('Mimetype: ' + mimetype);
// if (/(css|javascript|video|vtt)/i.test(mimetype)) {
// var shortTitle = dirEntry.url.replace(/[^/]+\//g, '').substring(0, 18);
// uiUtil.pollSpinner('Getting ' + shortTitle + '...');
// }
// appstate.selectedArchive.readBinaryFile(dirEntry, function (fileDirEntry, content) {
// // clearTimeout(spinnerTimer);
// // spinnerTimer = setTimeout(uiUtil.clearSpinner, 1000);
// sendContentToSW(content.buffer);
// });
// }
});
}
};
appstate.selectedArchive.getDirEntryByPath(title).then(readFile).catch(function (err) {
@ -4275,14 +4255,12 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
// Scroll the old container to the top
articleWindow.scrollTo(0,0);
articleDocument = articleWindow.document.documentElement;
// Hide the document before injecting to avoid display flash before stylesheets are loaded; also improves performance
// during loading of assets in most browsers, but UWP mnobile (at least) cannot build the DOM if hidden
if ('serviceWorker' in navigator) articleDocument.hidden = true;
// ** Write article html to the new article container **
articleDocument.innerHTML = htmlArticle;
var docBody = articleDocument.querySelector('body');
if (articleWindow.kiwixType === 'iframe') {
// Add any missing classes stripped from the <html> tag
if (htmlCSS) htmlCSS.forEach(function (cl) {
@ -4376,8 +4354,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
checkToolbar();
var showArticle = function () {
articleDocument.bgcolor = "";
articleDocument.hidden = false;
articleWindow.document.body.hidden = false;
docBody.style.display = 'block';
};
if ('MSBlobBuilder' in window) {
// For legacy MS browsers, including UWP, delay causes blank screen on slow systems
@ -4417,7 +4394,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
if (!(/UWP/.test(params.appType) && (appstate.target === 'window' || appstate.messageChannelWaiting))) {
htmlArticle = htmlArticle.replace(/(<html\b[^>]*)>/i, '$1 bgcolor="' +
(cssUIThemeGetOrSet(params.cssTheme, true) !== 'light' ? 'grey' : 'whitesmoke') + '">');
if (!('MSBlobBuilder' in window)) htmlArticle = htmlArticle.replace(/(<body\b[^>]*)/i, '$1 hidden');
if (!('MSBlobBuilder' in window)) htmlArticle = htmlArticle.replace(/(<body\b[^>]*)/i, '$1 style="display: none;"');
}
// Display any hidden block elements, with a timeout, so as not to interfere with image loading