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

Decode URI encoding for dependencies (images, JS, CSS etc).

Browse Source 
It's necessary for some of them that have special characters in it.
This commit is contained in:
mossroy 2016-01-08 14:58:26 +01:00
parent 21ce7b14d3
commit f47523836d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service-worker.js
View File

@ -143,7 +143,7 @@ function(util) {
} }
// We need to remove the potential parameters in the URL // We need to remove the potential parameters in the URL
titleName = util.removeUrlParameters(titleName); titleName = util.removeUrlParameters(decodeURIComponent(titleName));
titleNameWithNameSpace = nameSpace + '/' + titleName; titleNameWithNameSpace = nameSpace + '/' + titleName;

7
www/js/app.js
View File

@ -980,7 +980,8 @@ define(['jquery', 'abstractBackend', 'util', 'cookies','geometry','osabstraction
// It's a standard image contained in the ZIM file // It's a standard image contained in the ZIM file
var imageMatch = image.attr("src").match(regexpImageUrl); var imageMatch = image.attr("src").match(regexpImageUrl);
if (imageMatch) { if (imageMatch) {
selectedArchive.getTitleByName(imageMatch[1]).then(function(title) { var titleName = decodeURIComponent(imageMatch[1]);
selectedArchive.getTitleByName(titleName).then(function(title) {
selectedArchive.readBinaryFile(title, function (readableTitleName, content) { selectedArchive.readBinaryFile(title, function (readableTitleName, content) {
// TODO : add the complete MIME-type of the image (as read from the ZIM file) // TODO : add the complete MIME-type of the image (as read from the ZIM file)
image.attr("src", 'data:image;base64,' + util.uint8ArrayToBase64(content)); image.attr("src", 'data:image;base64,' + util.uint8ArrayToBase64(content));
@ -998,7 +999,7 @@ define(['jquery', 'abstractBackend', 'util', 'cookies','geometry','osabstraction
var hrefMatch = link.attr("href").match(regexpMetadataUrl); var hrefMatch = link.attr("href").match(regexpMetadataUrl);
if (hrefMatch) { if (hrefMatch) {
// It's a CSS file contained in the ZIM file // It's a CSS file contained in the ZIM file
var titleName = util.removeUrlParameters(hrefMatch[1]); var titleName = util.removeUrlParameters(decodeURIComponent(hrefMatch[1]));
selectedArchive.getTitleByName(titleName).then(function(title) { selectedArchive.getTitleByName(titleName).then(function(title) {
selectedArchive.readBinaryFile(title, function (readableTitleName, content) { selectedArchive.readBinaryFile(title, function (readableTitleName, content) {
var cssContent = encodeURIComponent(util.uintToString(content)); var cssContent = encodeURIComponent(util.uintToString(content));
@ -1017,7 +1018,7 @@ define(['jquery', 'abstractBackend', 'util', 'cookies','geometry','osabstraction
// TODO check that the type of the script is text/javascript or application/javascript // TODO check that the type of the script is text/javascript or application/javascript
if (srcMatch) { if (srcMatch) {
// It's a Javascript file contained in the ZIM file // It's a Javascript file contained in the ZIM file
var titleName = util.removeUrlParameters(srcMatch[1]); var titleName = util.removeUrlParameters(decodeURIComponent(srcMatch[1]));
selectedArchive.getTitleByName(titleName).then(function(title) { selectedArchive.getTitleByName(titleName).then(function(title) {
selectedArchive.readBinaryFile(title, function (readableTitleName, content) { selectedArchive.readBinaryFile(title, function (readableTitleName, content) {
// TODO : I have to disable javascript for now // TODO : I have to disable javascript for now