From f47523836d3b50abe195192a25a5a98ab0c9efee Mon Sep 17 00:00:00 2001
From: mossroy <mossroy@mossroy.fr>
Date: Fri, 8 Jan 2016 14:58:26 +0100
Subject: [PATCH] Decode URI encoding for dependencies (images, JS, CSS etc).

It's necessary for some of them that have special characters in it.
---
 service-worker.js | 2 +-
 www/js/app.js     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/service-worker.js b/service-worker.js
index 998af580..74a35534 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -143,7 +143,7 @@ function(util) {
                 }
                 
                 // We need to remove the potential parameters in the URL
-                titleName = util.removeUrlParameters(titleName);
+                titleName = util.removeUrlParameters(decodeURIComponent(titleName));
                 
                 titleNameWithNameSpace = nameSpace + '/' + titleName;
 
diff --git a/www/js/app.js b/www/js/app.js
index fcc7aca8..90b63e86 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -980,7 +980,8 @@ define(['jquery', 'abstractBackend', 'util', 'cookies','geometry','osabstraction
                     // It's a standard image contained in the ZIM file
                     var imageMatch = image.attr("src").match(regexpImageUrl);
                     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) {
                                 // TODO : add the complete MIME-type of the image (as read from the ZIM file)
                                 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);
                 if (hrefMatch) {
                     // 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.readBinaryFile(title, function (readableTitleName, 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
                 if (srcMatch) {
                     // 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.readBinaryFile(title, function (readableTitleName, content) {
                             // TODO : I have to disable javascript for now