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

Support local anchors with a URL #428 (#429)

Browse Source 
Fixes #428
This commit is contained in:
Jaifroid 2018-10-21 07:36:53 +01:00 committed by GitHub
parent 835b086923
commit 94fda96280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/js/app.js
View File

@ -741,7 +741,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
iframeArticleContent.onload = function () {}; iframeArticleContent.onload = function () {};
$("#searchingArticles").hide(); $("#searchingArticles").hide();
}; };
iframeArticleContent.src = dirEntry.namespace + "/" + dirEntry.url; iframeArticleContent.src = dirEntry.namespace + "/" + encodeURIComponent(dirEntry.url);
// Display the iframe content // Display the iframe content
$("#articleContent").show(); $("#articleContent").show();
}; };
@ -814,8 +814,6 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
var regexpPath = /^(.*\/)[^\/]+$/; var regexpPath = /^(.*\/)[^\/]+$/;
// Pattern to find a ZIM URL (with its 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 = /^#/;
// Regex below finds images, scripts and stylesheets with ZIM-type metadata and image namespaces [kiwix-js #378] // Regex below finds images, scripts and stylesheets with ZIM-type metadata and image namespaces [kiwix-js #378]
// It first searches for <img, <script, or <link, then scans forward to find, on a word boundary, either src=["'] // It first searches for <img, <script, or <link, then scans forward to find, on a word boundary, either src=["']
// OR href=["'] (ignoring any extra whitespace), and it then tests everything up to the next ["'] against a pattern that // OR href=["'] (ignoring any extra whitespace), and it then tests everything up to the next ["'] against a pattern that
@ -881,10 +879,15 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
function parseAnchorsJQuery() { function parseAnchorsJQuery() {
var currentProtocol = location.protocol; var currentProtocol = location.protocol;
var currentHost = location.host; var currentHost = location.host;
// Percent-encode dirEntry.url and add regex escape character \ to the RegExp special characters - see https://www.regular-expressions.info/characters.html;
// NB dirEntry.url can also contain path separator / in some ZIMs (Stackexchange). } and ] do not need to be escaped as they have no meaning on their own.
var escapedUrl = encodeURIComponent(dirEntry.url).replace(/([\\$^.|?*+\/()[{])/g, '\\$1');
// Pattern to match a local anchor in an href even if prefixed by escaped url
var regexpLocalAnchorHref = new RegExp('^(?:#|' + escapedUrl + '#)([^#]+$)');
$('#articleContent').contents().find('body').find('a').each(function() { $('#articleContent').contents().find('body').find('a').each(function() {
var href = $(this).attr("href"); 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 zimUrl = regexpZIMUrlWithNamespace.test(this.href) ? this.href.match(regexpZIMUrlWithNamespace)[1] : ""; var zimUrl = regexpZIMUrlWithNamespace.test(this.href) ? this.href.match(regexpZIMUrlWithNamespace)[1] : '';
if (href === null || href === undefined) { if (href === null || href === undefined) {
// No href attribute // No href attribute
} }
@ -898,8 +901,9 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
else if (regexpLocalAnchorHref.test(href)) { else if (regexpLocalAnchorHref.test(href)) {
// It's an anchor link : we need to make it work with javascript // It's an anchor link : we need to make it work with javascript
// because of the base tag // because of the base tag
var anchorRef = href.replace(regexpLocalAnchorHref, '$1');
$(this).on('click', function(e) { $(this).on('click', function(e) {
$('#articleContent').first()[0].contentWindow.location.hash = href; document.getElementById('articleContent').contentWindow.location.hash = anchorRef;
return false; return false;
}); });
} }