From d83d69f61af048b7b7ee78df922a32b82f8701f5 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Wed, 13 Sep 2017 15:22:17 +0100 Subject: [PATCH] Re-enabled support for using Kiwix JS Windows in the browser This can now be run in the browser just like Kiwix JS and does not require UWP environment. Of course UWP is unaffected by this change. Former-commit-id: 5c7dc3a4010812d9d1bcf926cabfbfd278d8dc34 [formerly 96364f5624ef8793f51827f4d44bb307feb14c39] Former-commit-id: cc8ac5ad789bc11d489f14e953d0cfef9260a19a --- KiwixWebApp.jsproj.user | 2 +- bin/Release/AppX/AppxManifest.xml | 4 +--- bin/Release/AppX/vs.appxrecipe | 16 ++++++++-------- bin/Release/AppX/www/css/bootstrap.css | 2 +- bin/Release/AppX/www/index.html | 8 +++++++- bin/Release/AppX/www/js/app.js | 15 ++++++++++++++- bin/Release/KiwixWebApp.build.appxrecipe | 2 +- bin/Release/{ => ReverseMap}/resources.pri | Bin 40824 -> 65416 bytes .../KiwixWebApp.jsproj.FileListAbsolute.txt | 2 +- www/index.html | 8 +++++++- www/js/app.js | 15 ++++++++++++++- 11 files changed, 55 insertions(+), 19 deletions(-) rename bin/Release/{ => ReverseMap}/resources.pri (62%) diff --git a/KiwixWebApp.jsproj.user b/KiwixWebApp.jsproj.user index b2c1eaa2..433cb68d 100644 --- a/KiwixWebApp.jsproj.user +++ b/KiwixWebApp.jsproj.user @@ -21,7 +21,7 @@ F0AB49D8-754C-4531-A635-E6B4395FD39A;Mobile Emulator 10.0.15063.0 QHD 5.2 inch 3GB - AppHostDeviceDebugger + AppHostLocalDebugger 7C3F55B7-619D-452D-B6B0-A4A36BC552CC;Mobile Emulator 10.0.15063.0 720p 5 inch 1GB \ No newline at end of file diff --git a/bin/Release/AppX/AppxManifest.xml b/bin/Release/AppX/AppxManifest.xml index f9a4f5f8..137520e6 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 @@ -46,7 +46,6 @@ ZIM Archive Compressed ZIM FIle Archive - .zim .zimaa @@ -58,7 +57,6 @@ - diff --git a/bin/Release/AppX/vs.appxrecipe b/bin/Release/AppX/vs.appxrecipe index 7065fe49..df24d325 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 - C16D189268AC138A7AEBC32F9392907DA8637CE76181AB56C8491D20A2C867E6 - Kiwix.KiwixJS_0.8.5.0_neutral__zfxmafgedzx24 + B936BD7BD91AAF32F4562C16AA473E3158195355537283D88567D6770E2F2578 + Kiwix.KiwixJS_0.8.6.0_neutral__zfxmafgedzx24 Kiwix.KiwixJS_zfxmafgedzx24!App Kiwix.KiwixJS CN=geoff - 0.8.5.0 + 0.8.6.0 True AppxManifest.xml true - 2017-09-12T13:37:06.309 + 2017-09-13T14:18:50.870 @@ -479,7 +479,7 @@ www\css\bootstrap.css - 2017-09-09T12:51:51.410 + 2017-09-13T12:39:31.771 www\A\dummyArticle.html @@ -487,7 +487,7 @@ www\index.html - 2017-09-11T16:17:58.025 + 2017-09-13T13:42:11.583 www\favicon.ico @@ -615,7 +615,7 @@ www\js\app.js - 2017-09-12T13:20:35.297 + 2017-09-13T14:17:09.385 www\js\init.js @@ -1544,7 +1544,7 @@ resources.pri true - 2017-09-12T11:20:34.442 + 2017-09-13T14:18:50.544 diff --git a/bin/Release/AppX/www/css/bootstrap.css b/bin/Release/AppX/www/css/bootstrap.css index b580210b..ae9a2f5b 100644 --- a/bin/Release/AppX/www/css/bootstrap.css +++ b/bin/Release/AppX/www/css/bootstrap.css @@ -1,4 +1,4 @@ -/*! +/*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com * Copyright 2012-2017 Thomas Park diff --git a/bin/Release/AppX/www/index.html b/bin/Release/AppX/www/index.html index 684a55b3..b079b456 100644 --- a/bin/Release/AppX/www/index.html +++ b/bin/Release/AppX/www/index.html @@ -275,12 +275,18 @@

This application needs a ZIM archive to work. You can get one from the download links panel.