From 37405cda2fd764e3edfe2a9205ffb13b29ccae6f Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Sun, 3 Dec 2017 17:27:28 +0000
Subject: [PATCH] Bin

Former-commit-id: 4b6722ef13eb9862344a65fa61d7386e5f5367f6 [formerly abb58891eda3c0d37f7c2678b53703143ff4978f]
Former-commit-id: 0163a3e7c6b9e0454c5a438d446934b8fb185817
---
 bin/Release/AppX/vs.appxrecipe                | 4 ++--
 bin/Release/AppX/www/js/app.js                | 4 ++++
 bld/ARM/Release/ilc/in/www/js/app.js          | 4 ++++
 bld/Release/PackageLayout/www/js/app.js       | 4 ++++
 bld/Release/PackageUploadLayout/www/js/app.js | 4 ++++
 bld/x64/Release/ilc/in/www/js/app.js          | 4 ++++
 bld/x86/Release/ilc/in/www/js/app.js          | 4 ++++
 7 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bin/Release/AppX/vs.appxrecipe b/bin/Release/AppX/vs.appxrecipe
index 1523d667..5cecc023 100644
--- a/bin/Release/AppX/vs.appxrecipe
+++ b/bin/Release/AppX/vs.appxrecipe
@@ -32,7 +32,7 @@
     <AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\AppxManifest.xml">
       <PackagePath>AppxManifest.xml</PackagePath>
       <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
-      <Modified>2017-12-03T09:42:38.471</Modified>
+      <Modified>2017-12-03T15:40:06.899</Modified>
     </AppXManifest>
   </ItemGroup>
   <ItemGroup>
@@ -615,7 +615,7 @@
     </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\app.js">
       <PackagePath>www\js\app.js</PackagePath>
-      <Modified>2017-12-03T09:02:29.092</Modified>
+      <Modified>2017-12-03T15:39:56.899</Modified>
     </AppxPackagedFile>
     <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\init.js">
       <PackagePath>www\js\init.js</PackagePath>
diff --git a/bin/Release/AppX/www/js/app.js b/bin/Release/AppX/www/js/app.js
index e66af5bb..bf0595f1 100644
--- a/bin/Release/AppX/www/js/app.js
+++ b/bin/Release/AppX/www/js/app.js
@@ -1577,6 +1577,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
             for (var i = 0; i < arr.length; i++) {
                 var linkArray = regexpSheetHref.exec(arr[i]);
                 regexpSheetHref.lastIndex = 0; //Reset start position for next loop
+
+                //@BUG WORKAROUND for Kiwix-JS-Windows #18
+                linkArray[2] = linkArray[2].replace(/^(s\/[\s\S]+(?!\.css))$/i, "../-/$1.css"); 
+
                 if (linkArray && regexpMetadataUrl.test(linkArray[2])) { //It's a CSS file contained in ZIM
                     var zimLink = decodeURIComponent(uiUtil.removeUrlParameters(linkArray[2]));
                     /* zl = zimLink; zim = zimType; cc = cssCache; cs = cssSource; i  */
diff --git a/bld/ARM/Release/ilc/in/www/js/app.js b/bld/ARM/Release/ilc/in/www/js/app.js
index e66af5bb..bf0595f1 100644
--- a/bld/ARM/Release/ilc/in/www/js/app.js
+++ b/bld/ARM/Release/ilc/in/www/js/app.js
@@ -1577,6 +1577,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
             for (var i = 0; i < arr.length; i++) {
                 var linkArray = regexpSheetHref.exec(arr[i]);
                 regexpSheetHref.lastIndex = 0; //Reset start position for next loop
+
+                //@BUG WORKAROUND for Kiwix-JS-Windows #18
+                linkArray[2] = linkArray[2].replace(/^(s\/[\s\S]+(?!\.css))$/i, "../-/$1.css"); 
+
                 if (linkArray && regexpMetadataUrl.test(linkArray[2])) { //It's a CSS file contained in ZIM
                     var zimLink = decodeURIComponent(uiUtil.removeUrlParameters(linkArray[2]));
                     /* zl = zimLink; zim = zimType; cc = cssCache; cs = cssSource; i  */
diff --git a/bld/Release/PackageLayout/www/js/app.js b/bld/Release/PackageLayout/www/js/app.js
index e66af5bb..bf0595f1 100644
--- a/bld/Release/PackageLayout/www/js/app.js
+++ b/bld/Release/PackageLayout/www/js/app.js
@@ -1577,6 +1577,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
             for (var i = 0; i < arr.length; i++) {
                 var linkArray = regexpSheetHref.exec(arr[i]);
                 regexpSheetHref.lastIndex = 0; //Reset start position for next loop
+
+                //@BUG WORKAROUND for Kiwix-JS-Windows #18
+                linkArray[2] = linkArray[2].replace(/^(s\/[\s\S]+(?!\.css))$/i, "../-/$1.css"); 
+
                 if (linkArray && regexpMetadataUrl.test(linkArray[2])) { //It's a CSS file contained in ZIM
                     var zimLink = decodeURIComponent(uiUtil.removeUrlParameters(linkArray[2]));
                     /* zl = zimLink; zim = zimType; cc = cssCache; cs = cssSource; i  */
diff --git a/bld/Release/PackageUploadLayout/www/js/app.js b/bld/Release/PackageUploadLayout/www/js/app.js
index e66af5bb..bf0595f1 100644
--- a/bld/Release/PackageUploadLayout/www/js/app.js
+++ b/bld/Release/PackageUploadLayout/www/js/app.js
@@ -1577,6 +1577,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
             for (var i = 0; i < arr.length; i++) {
                 var linkArray = regexpSheetHref.exec(arr[i]);
                 regexpSheetHref.lastIndex = 0; //Reset start position for next loop
+
+                //@BUG WORKAROUND for Kiwix-JS-Windows #18
+                linkArray[2] = linkArray[2].replace(/^(s\/[\s\S]+(?!\.css))$/i, "../-/$1.css"); 
+
                 if (linkArray && regexpMetadataUrl.test(linkArray[2])) { //It's a CSS file contained in ZIM
                     var zimLink = decodeURIComponent(uiUtil.removeUrlParameters(linkArray[2]));
                     /* zl = zimLink; zim = zimType; cc = cssCache; cs = cssSource; i  */
diff --git a/bld/x64/Release/ilc/in/www/js/app.js b/bld/x64/Release/ilc/in/www/js/app.js
index e66af5bb..bf0595f1 100644
--- a/bld/x64/Release/ilc/in/www/js/app.js
+++ b/bld/x64/Release/ilc/in/www/js/app.js
@@ -1577,6 +1577,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
             for (var i = 0; i < arr.length; i++) {
                 var linkArray = regexpSheetHref.exec(arr[i]);
                 regexpSheetHref.lastIndex = 0; //Reset start position for next loop
+
+                //@BUG WORKAROUND for Kiwix-JS-Windows #18
+                linkArray[2] = linkArray[2].replace(/^(s\/[\s\S]+(?!\.css))$/i, "../-/$1.css"); 
+
                 if (linkArray && regexpMetadataUrl.test(linkArray[2])) { //It's a CSS file contained in ZIM
                     var zimLink = decodeURIComponent(uiUtil.removeUrlParameters(linkArray[2]));
                     /* zl = zimLink; zim = zimType; cc = cssCache; cs = cssSource; i  */
diff --git a/bld/x86/Release/ilc/in/www/js/app.js b/bld/x86/Release/ilc/in/www/js/app.js
index e66af5bb..bf0595f1 100644
--- a/bld/x86/Release/ilc/in/www/js/app.js
+++ b/bld/x86/Release/ilc/in/www/js/app.js
@@ -1577,6 +1577,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
             for (var i = 0; i < arr.length; i++) {
                 var linkArray = regexpSheetHref.exec(arr[i]);
                 regexpSheetHref.lastIndex = 0; //Reset start position for next loop
+
+                //@BUG WORKAROUND for Kiwix-JS-Windows #18
+                linkArray[2] = linkArray[2].replace(/^(s\/[\s\S]+(?!\.css))$/i, "../-/$1.css"); 
+
                 if (linkArray && regexpMetadataUrl.test(linkArray[2])) { //It's a CSS file contained in ZIM
                     var zimLink = decodeURIComponent(uiUtil.removeUrlParameters(linkArray[2]));
                     /* zl = zimLink; zim = zimType; cc = cssCache; cs = cssSource; i  */