From 305d60f3024f7eb6046a3de4a958c5d70779f0c8 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Mon, 10 Jul 2017 21:58:02 +0100 Subject: [PATCH] Build Former-commit-id: 1c7b78488de881c5d61c891d4b50bac683c4e0f1 [formerly 98a0450ca4d598ec9ba8002c175138f15c134877] Former-commit-id: abf70505f74e549ce302c3ada7dc421150c1882e --- KiwixWebApp.jsproj.user | 4 ++-- bin/Release/AppX/AppxManifest.xml | 2 +- bin/Release/AppX/vs.appxrecipe | 14 +++++++------- bin/Release/AppX/www/js/app.js | 2 +- bin/Release/AppX/www/js/init.js | 2 +- bin/Release/KiwixWebApp.build.appxrecipe | 2 +- bin/Release/{ => ReverseMap}/resources.pri | Bin 8912 -> 15552 bytes .../KiwixWebApp.jsproj.FileListAbsolute.txt | 2 +- bld/Release/PackageLayout/www/js/init.js | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename bin/Release/{ => ReverseMap}/resources.pri (55%) diff --git a/KiwixWebApp.jsproj.user b/KiwixWebApp.jsproj.user index ef98e305..1a8add84 100644 --- a/KiwixWebApp.jsproj.user +++ b/KiwixWebApp.jsproj.user @@ -14,13 +14,13 @@ False False neutral - True + False AppHostLocalDebugger F0AB49D8-754C-4531-A635-E6B4395FD39A;Mobile Emulator 10.0.15063.0 QHD 5.2 inch 3GB - AppHostDeviceDebugger + AppHostLocalDebugger \ No newline at end of file diff --git a/bin/Release/AppX/AppxManifest.xml b/bin/Release/AppX/AppxManifest.xml index 3a5f1f46..a5aab70b 100644 --- a/bin/Release/AppX/AppxManifest.xml +++ b/bin/Release/AppX/AppxManifest.xml @@ -7,7 +7,7 @@ For more information on package manifest files, see http://go.microsoft.com/fwlink/?LinkID=241727 --> - + Kiwix JS diff --git a/bin/Release/AppX/vs.appxrecipe b/bin/Release/AppX/vs.appxrecipe index 6c851478..60f18791 100644 --- a/bin/Release/AppX/vs.appxrecipe +++ b/bin/Release/AppX/vs.appxrecipe @@ -20,19 +20,19 @@ C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\AppX - 1D6B0A96F9B402B5EFE59940DB072C32489A52BD9CB3F78B913F83836FF7D17E - a1a5e0b9-13d4-41fb-810d-518949f03df4_0.5.0.0_neutral__zfxmafgedzx24 + 9B4FA2C6D43297D8009F6D2EAD9B98BE3D00DC06E24A883C19470665453793EF + a1a5e0b9-13d4-41fb-810d-518949f03df4_0.5.1.0_neutral__zfxmafgedzx24 a1a5e0b9-13d4-41fb-810d-518949f03df4_zfxmafgedzx24!App a1a5e0b9-13d4-41fb-810d-518949f03df4 CN=geoff - 0.5.0.0 + 0.5.1.0 True AppxManifest.xml true - 2017-07-10T17:02:01.327 + 2017-07-10T19:34:13.265 @@ -371,11 +371,11 @@ www\js\app.js - 2017-07-10T17:00:39.343 + 2017-07-10T17:08:27.704 www\js\init.js - 2017-07-10T16:37:03.525 + 2017-07-10T19:27:56.859 www\js\lib\abstractFilesystemAccess.js @@ -440,7 +440,7 @@ resources.pri true - 2017-07-10T17:02:01.227 + 2017-07-10T19:28:05.021 diff --git a/bin/Release/AppX/www/js/app.js b/bin/Release/AppX/www/js/app.js index 36e61c20..99be9a38 100644 --- a/bin/Release/AppX/www/js/app.js +++ b/bin/Release/AppX/www/js/app.js @@ -821,7 +821,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles selectedArchive.getDirEntryByTitle(title).then( function (dirEntry) { selectedArchive.readBinaryFile(dirEntry, function (readableTitle, content) { - var cssContent = util.uintToString(content); //Uncomment this line and break on next to capture cssContent for local filesystem cache + //var cssContent = util.uintToString(content); //Uncomment this line and break on next to capture cssContent for local filesystem cache var cssBlob = new Blob([content], { type: 'text/css' }); var newURL = URL.createObjectURL(cssBlob); blobArray[index] = newURL; diff --git a/bin/Release/AppX/www/js/init.js b/bin/Release/AppX/www/js/init.js index 37c88289..77cf41b7 100644 --- a/bin/Release/AppX/www/js/init.js +++ b/bin/Release/AppX/www/js/init.js @@ -23,7 +23,7 @@ 'use strict'; var params = {}; var results = params['results'] || 10; //Number of search results to display -var cssSource = params['cssSource'] || "local"; //One of "zimfile", "local" or "mobile"" +var cssSource = params['cssSource'] || "zimfile"; //One of "zimfile", "local" or "mobile"" require.config({ baseUrl: 'js/lib', diff --git a/bin/Release/KiwixWebApp.build.appxrecipe b/bin/Release/KiwixWebApp.build.appxrecipe index 64090079..db8b734d 100644 --- a/bin/Release/KiwixWebApp.build.appxrecipe +++ b/bin/Release/KiwixWebApp.build.appxrecipe @@ -337,7 +337,7 @@ www\js\lib\zimfile.js - + resources.pri true diff --git a/bin/Release/resources.pri b/bin/Release/ReverseMap/resources.pri similarity index 55% rename from bin/Release/resources.pri rename to bin/Release/ReverseMap/resources.pri index d4185e3f84b41092ba33908f2f58008fd15c6a15..a2d5c21ce184062e83344ff34a6ff3789179ff6d 100644 GIT binary patch literal 15552 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 delta 56 zcmX?5dBIgOw