kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-12 05:48:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-enabled support for using Kiwix JS Windows in the browser

Browse Source 
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
This commit is contained in:
Jaifroid 2017-09-13 15:22:17 +01:00
parent fb9742ca4b
commit d83d69f61a
11 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
KiwixWebApp.jsproj.user
View File

@ -21,7 +21,7 @@
<WindowsPhoneEmulatorID>F0AB49D8-754C-4531-A635-E6B4395FD39A;Mobile Emulator 10.0.15063.0 QHD 5.2 inch 3GB</WindowsPhoneEmulatorID> <WindowsPhoneEmulatorID>F0AB49D8-754C-4531-A635-E6B4395FD39A;Mobile Emulator 10.0.15063.0 QHD 5.2 inch 3GB</WindowsPhoneEmulatorID>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebuggerFlavor>AppHostDeviceDebugger</DebuggerFlavor> <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
<WindowsPhoneEmulatorID>7C3F55B7-619D-452D-B6B0-A4A36BC552CC;Mobile Emulator 10.0.15063.0 720p 5 inch 1GB</WindowsPhoneEmulatorID> <WindowsPhoneEmulatorID>7C3F55B7-619D-452D-B6B0-A4A36BC552CC;Mobile Emulator 10.0.15063.0 720p 5 inch 1GB</WindowsPhoneEmulatorID>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
bin/Release/AppX/AppxManifest.xml
View File

@ -7,7 +7,7 @@
For more information on package manifest files, see http://go.microsoft.com/fwlink/?LinkID=241727 For more information on package manifest files, see http://go.microsoft.com/fwlink/?LinkID=241727
--> -->
<Identity Name="Kiwix.KiwixJS" Version="0.8.5.0" Publisher="CN=geoff" ProcessorArchitecture="neutral" /> <Identity Name="Kiwix.KiwixJS" Version="0.8.6.0" Publisher="CN=geoff" ProcessorArchitecture="neutral" />
<mp:PhoneIdentity PhoneProductId="a1a5e0b9-13d4-41fb-810d-518949f03df4" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <mp:PhoneIdentity PhoneProductId="a1a5e0b9-13d4-41fb-810d-518949f03df4" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties> <Properties>
<DisplayName>Kiwix JS</DisplayName> <DisplayName>Kiwix JS</DisplayName>
@ -46,7 +46,6 @@
<uap:FileTypeAssociation Name="zimarchive"> <uap:FileTypeAssociation Name="zimarchive">
<uap:DisplayName>ZIM Archive</uap:DisplayName> <uap:DisplayName>ZIM Archive</uap:DisplayName>
<uap:InfoTip>Compressed ZIM FIle Archive</uap:InfoTip> <uap:InfoTip>Compressed ZIM FIle Archive</uap:InfoTip>
<uap:EditFlags OpenIsSafe="true" />
<uap:SupportedFileTypes> <uap:SupportedFileTypes>
<uap:FileType ContentType="application/zlib">.zim</uap:FileType> <uap:FileType ContentType="application/zlib">.zim</uap:FileType>
<uap:FileType ContentType="application/zlib">.zimaa</uap:FileType> <uap:FileType ContentType="application/zlib">.zimaa</uap:FileType>
@ -58,7 +57,6 @@
</Applications> </Applications>
<Capabilities> <Capabilities>
<Capability Name="internetClient" /> <Capability Name="internetClient" />
<uap:Capability Name="removableStorage" />
<DeviceCapability Name="location" /> <DeviceCapability Name="location" />
</Capabilities> </Capabilities>
<build:Metadata> <build:Metadata>

16
bin/Release/AppX/vs.appxrecipe
View File

@ -20,19 +20,19 @@
<WindowsSdkPath> <WindowsSdkPath>
</WindowsSdkPath> </WindowsSdkPath>
<LayoutDir>C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\AppX</LayoutDir> <LayoutDir>C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\AppX</LayoutDir>
<RegisteredManifestChecksum>C16D189268AC138A7AEBC32F9392907DA8637CE76181AB56C8491D20A2C867E6</RegisteredManifestChecksum> <RegisteredManifestChecksum>B936BD7BD91AAF32F4562C16AA473E3158195355537283D88567D6770E2F2578</RegisteredManifestChecksum>
<RegisteredPackageMoniker>Kiwix.KiwixJS_0.8.5.0_neutral__zfxmafgedzx24</RegisteredPackageMoniker> <RegisteredPackageMoniker>Kiwix.KiwixJS_0.8.6.0_neutral__zfxmafgedzx24</RegisteredPackageMoniker>
<RegisteredUserModeAppID>Kiwix.KiwixJS_zfxmafgedzx24!App</RegisteredUserModeAppID> <RegisteredUserModeAppID>Kiwix.KiwixJS_zfxmafgedzx24!App</RegisteredUserModeAppID>
<RegisteredPackageID>Kiwix.KiwixJS</RegisteredPackageID> <RegisteredPackageID>Kiwix.KiwixJS</RegisteredPackageID>
<RegisteredPackagePublisher>CN=geoff</RegisteredPackagePublisher> <RegisteredPackagePublisher>CN=geoff</RegisteredPackagePublisher>
<RegisteredVersion>0.8.5.0</RegisteredVersion> <RegisteredVersion>0.8.6.0</RegisteredVersion>
<JitOptimizationSuppressed>True</JitOptimizationSuppressed> <JitOptimizationSuppressed>True</JitOptimizationSuppressed>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\AppxManifest.xml"> <AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\AppxManifest.xml">
<PackagePath>AppxManifest.xml</PackagePath> <PackagePath>AppxManifest.xml</PackagePath>
<ReRegisterAppIfChanged>true</ReRegisterAppIfChanged> <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
<Modified>2017-09-12T13:37:06.309</Modified> <Modified>2017-09-13T14:18:50.870</Modified>
</AppXManifest> </AppXManifest>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -479,7 +479,7 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\css\bootstrap.css"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\css\bootstrap.css">
<PackagePath>www\css\bootstrap.css</PackagePath> <PackagePath>www\css\bootstrap.css</PackagePath>
<Modified>2017-09-09T12:51:51.410</Modified> <Modified>2017-09-13T12:39:31.771</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\A\dummyArticle.html"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\A\dummyArticle.html">
<PackagePath>www\A\dummyArticle.html</PackagePath> <PackagePath>www\A\dummyArticle.html</PackagePath>
@ -487,7 +487,7 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\index.html"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\index.html">
<PackagePath>www\index.html</PackagePath> <PackagePath>www\index.html</PackagePath>
<Modified>2017-09-11T16:17:58.025</Modified> <Modified>2017-09-13T13:42:11.583</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\favicon.ico"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\favicon.ico">
<PackagePath>www\favicon.ico</PackagePath> <PackagePath>www\favicon.ico</PackagePath>
@ -615,7 +615,7 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\app.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\app.js">
<PackagePath>www\js\app.js</PackagePath> <PackagePath>www\js\app.js</PackagePath>
<Modified>2017-09-12T13:20:35.297</Modified> <Modified>2017-09-13T14:17:09.385</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\init.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\init.js">
<PackagePath>www\js\init.js</PackagePath> <PackagePath>www\js\init.js</PackagePath>
@ -1544,7 +1544,7 @@
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\ReverseMap\resources.pri"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\ReverseMap\resources.pri">
<PackagePath>resources.pri</PackagePath> <PackagePath>resources.pri</PackagePath>
<ReRegisterAppIfChanged>true</ReRegisterAppIfChanged> <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
<Modified>2017-09-12T11:20:34.442</Modified> <Modified>2017-09-13T14:18:50.544</Modified>
</AppxPackagedFile> </AppxPackagedFile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
bin/Release/AppX/www/css/bootstrap.css vendored
View File

@ -1,4 +1,4 @@
/*! /*!
* bootswatch v3.3.7 * bootswatch v3.3.7
* Homepage: http://bootswatch.com * Homepage: http://bootswatch.com
* Copyright 2012-2017 Thomas Park * Copyright 2012-2017 Thomas Park

8
bin/Release/AppX/www/index.html
View File

@ -275,12 +275,18 @@
<p>This application needs a ZIM archive to work. You can get one from the <a href="#downloads">download links panel</a>.</p> <p>This application needs a ZIM archive to work. You can get one from the <a href="#downloads">download links panel</a>.</p>
</div> </div>
<div id="openLocalFiles" style="display: none;"> <div id="openLocalFiles" style="display: none;">
<div class="row"> <div id="UWPInstructions" class="row">
<p> <p>
If you have a single (unsplit) ZIM archive, use the <b>first</b> button.<br /> If you have a single (unsplit) ZIM archive, use the <b>first</b> button.<br />
For a split archive (.zimaa, .zimab, etc.) or multiple archives, use the <b>second</b> button. For a split archive (.zimaa, .zimab, etc.) or multiple archives, use the <b>second</b> button.
</p> </p>
</div> </div>
<div id="instructions" class="row" style="display:none;">
<p>
Please choose the location of your ZIM archive.<br />
For a split archive (.zimaa, .zimab, etc.) you must select <b>all</b> the split parts.
</p>
</div>
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-6">
<input type="button" class="btn btn-primary" value="Select single archive" id="archiveFile" accept=".zim" /> <input type="button" class="btn btn-primary" value="Select single archive" id="archiveFile" accept=".zim" />

15
bin/Release/AppX/www/js/app.js
View File

@ -429,6 +429,15 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
if (params.localStorage && !params.pickedFolder && !params.pickedFile) { if (params.localStorage && !params.pickedFolder && !params.pickedFile) {
params.pickedFolder = params.localStorage; params.pickedFolder = params.localStorage;
} }
if (typeof Windows === 'undefined') {
//If not UWP, display legacy File Select
document.getElementById('archiveFile').style.display = "none";
document.getElementById('archiveFiles').style.display = "none";
document.getElementById('UWPInstructions').style.display = "none";
document.getElementById('instructions').style.display = "inline";
document.getElementById('archiveFilesLegacy').style.display = "inline";
$('#archiveFilesLegacy').on('change', setLocalArchiveFromFileSelect)
}
return false; return false;
}); });
$('#btnAbout').on('click', function (e) { $('#btnAbout').on('click', function (e) {
@ -1124,6 +1133,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
*/ */
function displayFileSelect() { function displayFileSelect() {
$('#openLocalFiles').show(); $('#openLocalFiles').show();
if (typeof Windows === 'undefined') {
//If not UWP, display legacy File Select
$('#btnConfigure').click();
}
//TODO - check if this is necessary or if it causes the archiveList change event to fire //TODO - check if this is necessary or if it causes the archiveList change event to fire
//Make archive list combo box fit the number of files //Make archive list combo box fit the number of files
//var comboArchiveList = document.getElementById('archiveList'); //var comboArchiveList = document.getElementById('archiveList');
@ -1221,7 +1234,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
* Sets the localArchive from the File selects populated by user * Sets the localArchive from the File selects populated by user
*/ */
function setLocalArchiveFromFileSelect() { function setLocalArchiveFromFileSelect() {
setLocalArchiveFromFileList(document.getElementById('archiveFiles').files); setLocalArchiveFromFileList(document.getElementById('archiveFilesLegacy').files);
} }
/** /**

2
bin/Release/KiwixWebApp.build.appxrecipe
View File

@ -1165,7 +1165,7 @@
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\MathJax\extensions\a11y\mathmaps\.htaccess"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\www\js\MathJax\extensions\a11y\mathmaps\.htaccess">
<PackagePath>www\js\MathJax\extensions\a11y\mathmaps\.htaccess</PackagePath> <PackagePath>www\js\MathJax\extensions\a11y\mathmaps\.htaccess</PackagePath>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\resources.pri"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\ReverseMap\resources.pri">
<PackagePath>resources.pri</PackagePath> <PackagePath>resources.pri</PackagePath>
<ReRegisterAppIfChanged>true</ReRegisterAppIfChanged> <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
</AppxPackagedFile> </AppxPackagedFile>

BIN
bin/Release/resources.pri → bin/Release/ReverseMap/resources.pri
View File

Binary file not shown.

2
bld/Release/KiwixWebApp.jsproj.FileListAbsolute.txt
View File

@ -46,4 +46,4 @@ C:\Users\geoff\Source\Repos\kiwix-js-windows\bld\Release\qualifiers.txt.intermed
C:\Users\geoff\Source\Repos\kiwix-js-windows\bld\Release\MultipleQualifiersPerDimensionFound.txt C:\Users\geoff\Source\Repos\kiwix-js-windows\bld\Release\MultipleQualifiersPerDimensionFound.txt
C:\Users\geoff\Source\Repos\kiwix-js-windows\bld\Release\ProjectArchitectures.txt C:\Users\geoff\Source\Repos\kiwix-js-windows\bld\Release\ProjectArchitectures.txt
C:\Users\geoff\Source\Repos\kiwix-js-windows\bld\Release\KiwixWebApp.jsproj.CoreCompileInputs.cache C:\Users\geoff\Source\Repos\kiwix-js-windows\bld\Release\KiwixWebApp.jsproj.CoreCompileInputs.cache
C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\resources.pri C:\Users\geoff\Source\Repos\kiwix-js-windows\bin\Release\ReverseMap\resources.pri

8
www/index.html
View File

@ -275,12 +275,18 @@
<p>This application needs a ZIM archive to work. You can get one from the <a href="#downloads">download links panel</a>.</p> <p>This application needs a ZIM archive to work. You can get one from the <a href="#downloads">download links panel</a>.</p>
</div> </div>
<div id="openLocalFiles" style="display: none;"> <div id="openLocalFiles" style="display: none;">
<div class="row"> <div id="UWPInstructions" class="row">
<p> <p>
If you have a single (unsplit) ZIM archive, use the <b>first</b> button.<br /> If you have a single (unsplit) ZIM archive, use the <b>first</b> button.<br />
For a split archive (.zimaa, .zimab, etc.) or multiple archives, use the <b>second</b> button. For a split archive (.zimaa, .zimab, etc.) or multiple archives, use the <b>second</b> button.
</p> </p>
</div> </div>
<div id="instructions" class="row" style="display:none;">
<p>
Please choose the location of your ZIM archive.<br />
For a split archive (.zimaa, .zimab, etc.) you must select <b>all</b> the split parts.
</p>
</div>
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-6">
<input type="button" class="btn btn-primary" value="Select single archive" id="archiveFile" accept=".zim" /> <input type="button" class="btn btn-primary" value="Select single archive" id="archiveFile" accept=".zim" />

15
www/js/app.js
View File

@ -429,6 +429,15 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
if (params.localStorage && !params.pickedFolder && !params.pickedFile) { if (params.localStorage && !params.pickedFolder && !params.pickedFile) {
params.pickedFolder = params.localStorage; params.pickedFolder = params.localStorage;
} }
if (typeof Windows === 'undefined') {
//If not UWP, display legacy File Select
document.getElementById('archiveFile').style.display = "none";
document.getElementById('archiveFiles').style.display = "none";
document.getElementById('UWPInstructions').style.display = "none";
document.getElementById('instructions').style.display = "inline";
document.getElementById('archiveFilesLegacy').style.display = "inline";
$('#archiveFilesLegacy').on('change', setLocalArchiveFromFileSelect)
}
return false; return false;
}); });
$('#btnAbout').on('click', function (e) { $('#btnAbout').on('click', function (e) {
@ -1124,6 +1133,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
*/ */
function displayFileSelect() { function displayFileSelect() {
$('#openLocalFiles').show(); $('#openLocalFiles').show();
if (typeof Windows === 'undefined') {
//If not UWP, display legacy File Select
$('#btnConfigure').click();
}
//TODO - check if this is necessary or if it causes the archiveList change event to fire //TODO - check if this is necessary or if it causes the archiveList change event to fire
//Make archive list combo box fit the number of files //Make archive list combo box fit the number of files
//var comboArchiveList = document.getElementById('archiveList'); //var comboArchiveList = document.getElementById('archiveList');
@ -1221,7 +1234,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
* Sets the localArchive from the File selects populated by user * Sets the localArchive from the File selects populated by user
*/ */
function setLocalArchiveFromFileSelect() { function setLocalArchiveFromFileSelect() {
setLocalArchiveFromFileList(document.getElementById('archiveFiles').files); setLocalArchiveFromFileList(document.getElementById('archiveFilesLegacy').files);
} }
/** /**