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

Fix retrieval of htmlContent to account for asynch cache

Browse Source 
Former-commit-id: 8c7ffcc93964106c31943d5be2ed3cfc7c6e20d8 [formerly 72c9a4fe0d66ba2d6e73b92b50cc8eb238d19d5c [formerly 8cc8eaafe8335819a9eb806861b5badb653acab8]]
Former-commit-id: e59abefe8fa8379a6c9e01e557c5c70991a575a3
Former-commit-id: 8ca55769da91c3bf6a2a6ede966a214ac8dd00dd
This commit is contained in:
Jaifroid 2021-01-22 14:30:21 +00:00
parent 91900958bf
commit a5c125b32b
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
www/js/app.js
View File

@ -1378,6 +1378,10 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
// Make user re-pick file if we have upgraded (it's less confusing than filehandle errors) - NOT NEEDED, remove in due course // Make user re-pick file if we have upgraded (it's less confusing than filehandle errors) - NOT NEEDED, remove in due course
// settingsStore.removeItem('listOfArchives'); // settingsStore.removeItem('listOfArchives');
// If we have an update, it is best not to preserve last read article
params.lastPageVisit = "";
// Update the installed version // Update the installed version
if (settingsStore.getItem('PWAInstalled')) { if (settingsStore.getItem('PWAInstalled')) {
params.PWAInstalled = params.version; params.PWAInstalled = params.version;
@ -2776,32 +2780,40 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
//Load lastPageVisit if it is the currently requested page //Load lastPageVisit if it is the currently requested page
if (!htmlContent) { if (!htmlContent) {
var lastPage = ''; var lastPage = '';
// NB code below must be able to run async, hence it is a function
var goToRetrievedContent = function(html) {
if (/<html[^>]*>/.test(html)) {
console.log("Fast article retrieval from localStorage: " + lastPage);
//if (~lastPage.indexOf(params.cachedStartPage)) params.isLandingPage = true;
setTimeout(function () {
displayArticleInForm(dirEntry, html);
}, 10);
} else {
//if (params.contentInjectionMode === 'jquery') {
// In jQuery mode, we read the article content in the backend and manually insert it in the iframe
appstate.selectedArchive.readUtf8File(dirEntry, displayArticleInForm);
// This is needed so that the html is cached in displayArticleInForm
params.lastPageVisit = '';
//}
}
};
if (params.rememberLastPage && params.lastPageVisit) lastPage = params.lastPageVisit.replace(/@kiwixKey@.+/, ""); if (params.rememberLastPage && params.lastPageVisit) lastPage = params.lastPageVisit.replace(/@kiwixKey@.+/, "");
if (params.rememberLastPage && (typeof Storage !== "undefined") && dirEntry.namespace + '/' + dirEntry.url == lastPage) { if (params.rememberLastPage && (typeof Storage !== "undefined") && dirEntry.namespace + '/' + dirEntry.url == lastPage) {
if (!params.lastPageHTML) { if (!params.lastPageHTML) {
cache.getArticle(params.lastPageVisit.replace(/.*@kiwixKey@/, ''), lastPage, function (html) { cache.getArticle(params.lastPageVisit.replace(/.*@kiwixKey@/, ''), lastPage, function (html) {
params.lastPageHTML = html; params.lastPageHTML = html;
htmlContent = params.lastPageHTML || htmlContent; htmlContent = params.lastPageHTML || htmlContent;
goToRetrievedContent(htmlContent);
}); });
} else { } else {
htmlContent = params.lastPageHTML; htmlContent = params.lastPageHTML;
goToRetrievedContent(htmlContent);
} }
}
if (/<html[^>]*>/.test(htmlContent)) {
console.log("Fast article retrieval from localStorage: " + lastPage);
//if (~lastPage.indexOf(params.cachedStartPage)) params.isLandingPage = true;
setTimeout(function () {
displayArticleInForm(dirEntry, htmlContent);
}, 10);
} else { } else {
//if (params.contentInjectionMode === 'jquery') { goToRetrievedContent(htmlContent);
// In jQuery mode, we read the article content in the backend and manually insert it in the iframe
appstate.selectedArchive.readUtf8File(dirEntry, displayArticleInForm);
// This is needed so that the html is cached in displayArticleInForm
params.lastPageVisit = '';
//}
} }
} }
} }