kiwix/kiwix-js
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js.git synced 2025-09-24 04:54:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix code style and assign the initial value of curTitle in goToMainArticle

Browse Source
This commit is contained in:
root 2020-02-03 23:53:36 -04:00
parent 4d82da52e1
commit 444564df66
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
www/js/app.js
View File

@ -85,8 +85,8 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
var globalDropZone = document.getElementById('search-article'); var globalDropZone = document.getElementById('search-article');
var configDropZone = document.getElementById('configuration'); var configDropZone = document.getElementById('configuration');
// Title for current url. // Title for current URL
var curTitle = "A/index"; var curTitle = "";
/** /**
* Resize the IFrame height, so that it fills the whole available height in the window * Resize the IFrame height, so that it fills the whole available height in the window
@ -1011,6 +1011,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
} }
} }
/** /**
* Read the article corresponding to the given dirEntry * Read the article corresponding to the given dirEntry
* @param {DirEntry} dirEntry The directory entry of the article to read * @param {DirEntry} dirEntry The directory entry of the article to read
@ -1021,8 +1022,12 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
if (!params.isLandingPage) document.getElementById('articleContent').contentWindow.focus(); if (!params.isLandingPage) document.getElementById('articleContent').contentWindow.focus();
// Early return if article's title not equal current url's title // Early return if article's title not equal current url's title
var matchUrl = dirEntry['namespace'] + "/" + dirEntry["url"]; var expectedArticleURLToBeDisplayed = dirEntry.namespace + "/" + dirEntry.url;
if(matchUrl !== curTitle) return; if(expectedArticleURLToBeDisplayed !== curTitle){
console.debug("Expected Article URL to be displayed:" + expectedArticleURLToBeDisplayed
+ " does not match current URL " + curTitle)
return;
}
if (contentInjectionMode === 'serviceworker') { if (contentInjectionMode === 'serviceworker') {
// In ServiceWorker mode, we simply set the iframe src. // In ServiceWorker mode, we simply set the iframe src.
@ -1159,8 +1164,12 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
if (regexpActiveContent.test(htmlArticle)) uiUtil.displayActiveContentWarning(); if (regexpActiveContent.test(htmlArticle)) uiUtil.displayActiveContentWarning();
} }
// Early return if article's title not equal current url's title // Early return if article's title not equal current url's title
var matchUrl = dirEntry['namespace'] + "/" + dirEntry["url"]; var expectedArticleURLToBeDisplayed = dirEntry.namespace + "/" + dirEntry.url;
if(matchUrl !== curTitle) return; if(expectedArticleURLToBeDisplayed !== curTitle){
console.debug("Expected Article URL to be displayed:" + expectedArticleURLToBeDisplayed +
" does not match current URL " + curTitle)
return;
}
// Replaces ZIM-style URLs of img, script, link and media tags with a data-kiwixurl to prevent 404 errors [kiwix-js #272 #376] // Replaces ZIM-style URLs of img, script, link and media tags with a data-kiwixurl to prevent 404 errors [kiwix-js #272 #376]
// This replacement also processes the URL to remove the path so that the URL is ready for subsequent jQuery functions // This replacement also processes the URL to remove the path so that the URL is ready for subsequent jQuery functions
@ -1524,6 +1533,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
} else { } else {
if (dirEntry.namespace === 'A') { if (dirEntry.namespace === 'A') {
params.isLandingPage = true; params.isLandingPage = true;
curTitle = dirEntry.namespace + "/" + dirEntry.url
readArticle(dirEntry); readArticle(dirEntry);
} else { } else {
console.error("The main page of this archive does not seem to be an article"); console.error("The main page of this archive does not seem to be an article");