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 anchor links, that were broken because of the base tag. (#319)

Browse Source 
Regression introduced by #310
It was also the occasion to refactor a bit this part of the code,
and to remove some obsolete code (related to the Evopedia file format)
Fixes #318
Also fixes #313 (handle links with other protocols like geo: tel: etc.)
This commit is contained in:
Mossroy 2017-12-23 21:35:52 +01:00 committed by Jaifroid
parent 7681f61b30
commit 3c034f983a
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
www/js/app.js
View File

@ -782,10 +782,12 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
}; };
// Compile some regular expressions needed to modify links // Compile some regular expressions needed to modify links
var regexpImageLink = /^.?\/?[^:]+:(.*)/; // Pattern to find the path in a url
var regexpPath = /^(.*\/)[^\/]+$/; var regexpPath = /^(.*\/)[^\/]+$/;
// Pattern for ZIM file namespace - see http://www.openzim.org/wiki/ZIM_file_format#Namespaces // Pattern to find a ZIM URL (with its namespace) - see http://www.openzim.org/wiki/ZIM_file_format#Namespaces
var regexpZIMUrlWithNamespace = /(?:^|\/)([-ABIJMUVWX]\/.+)/; var regexpZIMUrlWithNamespace = /(?:^|\/)([-ABIJMUVWX]\/.+)/;
// Pattern to match a local anchor in a href
var regexpLocalAnchorHref = /^#/;
// These regular expressions match both relative and absolute URLs // These regular expressions match both relative and absolute URLs
// Since late 2014, all ZIM files should use relative URLs // Since late 2014, all ZIM files should use relative URLs
var regexpImageUrl = /^(?:\.\.\/|\/)+(I\/.*)$/; var regexpImageUrl = /^(?:\.\.\/|\/)+(I\/.*)$/;
@ -820,38 +822,35 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
$('#articleContent').contents().find('head').find("base").detach(); $('#articleContent').contents().find('head').find("base").detach();
$('#articleContent').contents().find('head').append("<base href='" + baseUrl + "'>"); $('#articleContent').contents().find('head').append("<base href='" + baseUrl + "'>");
var currentProtocol = location.protocol;
var currentHost = location.host;
// Convert links into javascript calls // Convert links into javascript calls
$('#articleContent').contents().find('body').find('a').each(function() { $('#articleContent').contents().find('body').find('a').each(function() {
var href = $(this).attr("href");
// Compute current link's url (with its namespace), if applicable // Compute current link's url (with its namespace), if applicable
var url = regexpZIMUrlWithNamespace.test(this.href) ? this.href.match(regexpZIMUrlWithNamespace)[1] : $(this).attr("href"); var zimUrl = regexpZIMUrlWithNamespace.test(this.href) ? this.href.match(regexpZIMUrlWithNamespace)[1] : "";
if (url === null || url === undefined) { if (href === null || href === undefined) {
return; // No href attribute
} }
var lowerCaseUrl = url.toLowerCase(); else if (href.length === 0) {
var cssClass = $(this).attr("class"); // It's a link with an empty href, pointing to the current page.
// Because of the base tag, we need to modify it
if (cssClass === "new") {
// It's a link to a missing article : display a message
$(this).on('click', function(e) { $(this).on('click', function(e) {
alert("Missing article in Wikipedia"); return false;
});
}
else if (regexpLocalAnchorHref.test(href)) {
// It's an anchor link : we need to make it work with javascript
// because of the base tag
$(this).on('click', function(e) {
$('#articleContent').first()[0].contentWindow.location.hash = href;
return false; return false;
}); });
} }
else if (url.slice(0, 1) === "#") { else if (this.protocol !== currentProtocol
// It's an anchor link : do nothing || this.host !== currentHost) {
} // It's an external URL : we should open it in a new tab
else if (url.substring(0, 4) === "http") {
// It's an external link : open in a new tab
$(this).attr("target", "_blank");
}
else if (url.match(regexpImageLink)
&& (util.endsWith(lowerCaseUrl, ".png")
|| util.endsWith(lowerCaseUrl, ".svg")
|| util.endsWith(lowerCaseUrl, ".jpg")
|| util.endsWith(lowerCaseUrl, ".jpeg"))) {
// It's a link to a file of Wikipedia : change the URL to the online version and open in a new tab
var onlineWikipediaUrl = url.replace(regexpImageLink, "https://" + selectedArchive._language + ".wikipedia.org/wiki/File:$1");
$(this).attr("href", onlineWikipediaUrl);
$(this).attr("target", "_blank"); $(this).attr("target", "_blank");
} }
else { else {
@ -859,7 +858,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
// Add an onclick event to go to this article // Add an onclick event to go to this article
// instead of following the link // instead of following the link
$(this).on('click', function(e) { $(this).on('click', function(e) {
var decodedURL = decodeURIComponent(url); var decodedURL = decodeURIComponent(zimUrl);
pushBrowserHistoryState(decodedURL); pushBrowserHistoryState(decodedURL);
goToArticle(decodedURL); goToArticle(decodedURL);
return false; return false;