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

Set articleWindow before articleContainer

Browse Source
This commit is contained in:
Jaifroid 2024-02-01 16:13:38 +00:00
parent 82e9a74291
commit 8155fc31df
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/js/app.js
View File

@ -5278,15 +5278,15 @@ function handleClickOnReplayLink (ev, anchor) {
// Handle middle-clicks and ctrl-clicks // Handle middle-clicks and ctrl-clicks
if (ev.ctrlKey || ev.metaKey || ev.button === 1) { if (ev.ctrlKey || ev.metaKey || ev.button === 1) {
var encodedTitle = encodeURIComponent(dirEntry.getTitleOrUrl()); var encodedTitle = encodeURIComponent(dirEntry.getTitleOrUrl());
articleContainer = window.open(pathToArticleDocumentRoot + zimUrl, articleWindow = window.open(pathToArticleDocumentRoot + zimUrl,
params.windowOpener === 'tab' ? '_blank' : encodedTitle, params.windowOpener === 'tab' ? '_blank' : encodedTitle,
params.windowOpener === 'window' ? 'toolbar=0,location=0,menubar=0,width=800,height=600,resizable=1,scrollbars=1' : null params.windowOpener === 'window' ? 'toolbar=0,location=0,menubar=0,width=800,height=600,resizable=1,scrollbars=1' : null
); );
// Conditional, because opening a new window can be blocked by the browser // Conditional, because opening a new window can be blocked by the browser
if (articleContainer) { if (articleWindow) {
appstate.target = 'window'; appstate.target = 'window';
articleContainer.kiwixType = appstate.target; articleWindow.kiwixType = appstate.target;
articleWindow = articleContainer; articleContainer = articleWindow;
} }
uiUtil.clearSpinner(); uiUtil.clearSpinner();
} else { } else {
@ -6364,7 +6364,8 @@ function displayArticleContentInContainer (dirEntry, htmlArticle) {
} }
// Display any hidden block elements, with a timeout, so as not to interfere with image loading // Display any hidden block elements, with a timeout, so as not to interfere with image loading
if (params.displayHiddenBlockElements && settingsStore.getItem('appVersion') === params.appVersion) { if (params.displayHiddenBlockElements && settingsStore.getItem('appVersion') === params.appVersion &&
!(/UWP/.test(params.appType) && appstate.target !== 'iframe')) {
setTimeout(function () { setTimeout(function () {
if (appstate.wikimediaZimLoaded || params.displayHiddenBlockElements === true) { if (appstate.wikimediaZimLoaded || params.displayHiddenBlockElements === true) {
displayHiddenBlockElements(articleWindow, articleDocument); displayHiddenBlockElements(articleWindow, articleDocument);