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.xml true - 2017-12-03T09:42:38.471 + 2017-12-03T15:40:06.899 @@ -615,7 +615,7 @@ www\js\app.js - 2017-12-03T09:02:29.092 + 2017-12-03T15:39:56.899 www\js\init.js 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 */