Update project files

Former-commit-id: 8bba46848b4837dc1dd38fd0cb04ec04e0c6e7d7 [formerly b587384c158ded0799386a99136304c018e84d98]
Former-commit-id: dbcec4ee074515ffdc26226319adac3fe8b263c9
This commit is contained in:
Jaifroid 2017-06-25 15:07:59 +01:00
parent 763c19fcec
commit a5a5c35514
26 changed files with 8271 additions and 63 deletions

View File

@ -131,9 +131,9 @@
<Content Include="www\js\app.js" /> <Content Include="www\js\app.js" />
<Content Include="www\js\init.js" /> <Content Include="www\js\init.js" />
<Content Include="www\js\lib\abstractFilesystemAccess.js" /> <Content Include="www\js\lib\abstractFilesystemAccess.js" />
<Content Include="www\js\lib\bootstrap.js" /> <Content Include="www\js\lib\bootstrap.min.js" />
<Content Include="www\js\lib\cookies.js" /> <Content Include="www\js\lib\cookies.js" />
<Content Include="www\js\lib\jquery-2.1.4.js" /> <Content Include="www\js\lib\jquery-3.2.1.slim.js" />
<Content Include="www\js\lib\q.js" /> <Content Include="www\js\lib\q.js" />
<Content Include="www\js\lib\require.js" /> <Content Include="www\js\lib\require.js" />
<Content Include="www\js\lib\uiUtil.js" /> <Content Include="www\js\lib\uiUtil.js" />

View File

@ -17,10 +17,10 @@
<PackageOptionalProjectsInIdeBuilds>False</PackageOptionalProjectsInIdeBuilds> <PackageOptionalProjectsInIdeBuilds>False</PackageOptionalProjectsInIdeBuilds>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebuggerFlavor>AppHostDeviceDebugger</DebuggerFlavor> <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
<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>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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="a1a5e0b9-13d4-41fb-810d-518949f03df4" Version="0.2.0.0" Publisher="CN=geoff" ProcessorArchitecture="neutral" /> <Identity Name="a1a5e0b9-13d4-41fb-810d-518949f03df4" Version="0.3.0.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>

Binary file not shown.

View File

@ -20,19 +20,19 @@
<WindowsSdkPath> <WindowsSdkPath>
</WindowsSdkPath> </WindowsSdkPath>
<LayoutDir>C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\AppX</LayoutDir> <LayoutDir>C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\AppX</LayoutDir>
<RegisteredManifestChecksum>2476C239653CB56E06388240153C49F4F5BB1F6E71EF7403BCEB10B507C13772</RegisteredManifestChecksum> <RegisteredManifestChecksum>3F3A982E681E889AE2A5AD292DD7EA55CCC80D8157EC9CCCFCD22590D4576300</RegisteredManifestChecksum>
<RegisteredPackageMoniker>a1a5e0b9-13d4-41fb-810d-518949f03df4_0.2.0.0_neutral__zfxmafgedzx24</RegisteredPackageMoniker> <RegisteredPackageMoniker>a1a5e0b9-13d4-41fb-810d-518949f03df4_0.3.0.0_neutral__zfxmafgedzx24</RegisteredPackageMoniker>
<RegisteredUserModeAppID>a1a5e0b9-13d4-41fb-810d-518949f03df4_zfxmafgedzx24!App</RegisteredUserModeAppID> <RegisteredUserModeAppID>a1a5e0b9-13d4-41fb-810d-518949f03df4_zfxmafgedzx24!App</RegisteredUserModeAppID>
<RegisteredPackageID>a1a5e0b9-13d4-41fb-810d-518949f03df4</RegisteredPackageID> <RegisteredPackageID>a1a5e0b9-13d4-41fb-810d-518949f03df4</RegisteredPackageID>
<RegisteredPackagePublisher>CN=geoff</RegisteredPackagePublisher> <RegisteredPackagePublisher>CN=geoff</RegisteredPackagePublisher>
<RegisteredVersion>0.2.0.0</RegisteredVersion> <RegisteredVersion>0.3.0.0</RegisteredVersion>
<JitOptimizationSuppressed>True</JitOptimizationSuppressed> <JitOptimizationSuppressed>True</JitOptimizationSuppressed>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\AppxManifest.xml"> <AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\AppxManifest.xml">
<PackagePath>AppxManifest.xml</PackagePath> <PackagePath>AppxManifest.xml</PackagePath>
<ReRegisterAppIfChanged>true</ReRegisterAppIfChanged> <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
<Modified>2017-06-19T06:51:03.041</Modified> <Modified>2017-06-25T13:48:59.655</Modified>
</AppXManifest> </AppXManifest>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -300,7 +300,7 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\index.html"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\index.html">
<PackagePath>www\index.html</PackagePath> <PackagePath>www\index.html</PackagePath>
<Modified>2017-06-16T16:26:11.288</Modified> <Modified>2017-06-21T19:37:19.038</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\app.css"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\app.css">
<PackagePath>www\css\app.css</PackagePath> <PackagePath>www\css\app.css</PackagePath>
@ -344,11 +344,11 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\app.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\app.js">
<PackagePath>www\js\app.js</PackagePath> <PackagePath>www\js\app.js</PackagePath>
<Modified>2017-06-16T16:31:46.926</Modified> <Modified>2017-06-22T06:07:50.858</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\init.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\init.js">
<PackagePath>www\js\init.js</PackagePath> <PackagePath>www\js\init.js</PackagePath>
<Modified>2017-06-16T16:31:46.927</Modified> <Modified>2017-06-25T09:57:54.599</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\abstractFilesystemAccess.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\abstractFilesystemAccess.js">
<PackagePath>www\js\lib\abstractFilesystemAccess.js</PackagePath> <PackagePath>www\js\lib\abstractFilesystemAccess.js</PackagePath>
@ -358,6 +358,10 @@
<PackagePath>www\js\lib\bootstrap.js</PackagePath> <PackagePath>www\js\lib\bootstrap.js</PackagePath>
<Modified>2017-06-16T16:31:46.977</Modified> <Modified>2017-06-16T16:31:46.977</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\bootstrap.min.js">
<PackagePath>www\js\lib\bootstrap.min.js</PackagePath>
<Modified>2017-06-24T18:35:30.233</Modified>
</AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\cookies.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\cookies.js">
<PackagePath>www\js\lib\cookies.js</PackagePath> <PackagePath>www\js\lib\cookies.js</PackagePath>
<Modified>2017-06-16T16:31:46.977</Modified> <Modified>2017-06-16T16:31:46.977</Modified>
@ -366,6 +370,10 @@
<PackagePath>www\js\lib\jquery-2.1.4.js</PackagePath> <PackagePath>www\js\lib\jquery-2.1.4.js</PackagePath>
<Modified>2017-06-16T16:31:47.078</Modified> <Modified>2017-06-16T16:31:47.078</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\jquery-3.2.1.slim.js">
<PackagePath>www\js\lib\jquery-3.2.1.slim.js</PackagePath>
<Modified>2017-06-24T18:35:30.412</Modified>
</AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\q.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\q.js">
<PackagePath>www\js\lib\q.js</PackagePath> <PackagePath>www\js\lib\q.js</PackagePath>
<Modified>2017-06-16T16:31:47.129</Modified> <Modified>2017-06-16T16:31:47.129</Modified>
@ -388,7 +396,7 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\xzdec.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\xzdec.js">
<PackagePath>www\js\lib\xzdec.js</PackagePath> <PackagePath>www\js\lib\xzdec.js</PackagePath>
<Modified>2017-06-19T06:50:32.223</Modified> <Modified>2017-06-21T19:37:19.170</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\xzdec_wrapper.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\xzdec_wrapper.js">
<PackagePath>www\js\lib\xzdec_wrapper.js</PackagePath> <PackagePath>www\js\lib\xzdec_wrapper.js</PackagePath>
@ -413,7 +421,7 @@
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\ReverseMap\resources.pri"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Debug\ReverseMap\resources.pri">
<PackagePath>resources.pri</PackagePath> <PackagePath>resources.pri</PackagePath>
<ReRegisterAppIfChanged>true</ReRegisterAppIfChanged> <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
<Modified>2017-06-19T06:47:39.316</Modified> <Modified>2017-06-25T13:42:35.993</Modified>
</AppxPackagedFile> </AppxPackagedFile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>KiwixWebApp</title> <title>Kiwix JS for Windows</title>
<meta name="description" content="Offline Wikipedia reader"> <meta name="description" content="Offline Wikipedia reader">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- <!--
@ -51,7 +51,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand">Kiwix 2.2-WIP</a> <a class="navbar-brand">Kiwix JS 0.x (beta)</a>
</div> </div>
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse"> <div class="collapse navbar-collapse navbar-ex1-collapse">
@ -123,15 +123,15 @@
<h3>Feedback / helping / contributing</h3> <h3>Feedback / helping / contributing</h3>
This application is still a work in progress. There are many bugs and improvements that need to be done. In particular : This application is still a work in progress. There are many bugs and improvements that need to be done. In particular :
<ul> <ul>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/114" target="_blank">Issue #114</a> : Add a way to easily download ZIM files directly to the device</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/114" target="_blank">Issue #114</a> : Add a way to easily download ZIM files directly to the device</li>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/13" target="_blank">Issue #13</a> : All the user interface is in English : I plan to translate it at least in French. If you feel able to translate it in your language, please contact me</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/13" target="_blank">Issue #13</a> : All the user interface is in English : I plan to translate it at least in French. If you feel able to translate it in your language, please contact me</li>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/172" target="_blank">Issue #172</a> and <a href="https://github.com/kiwix/kiwix-html5/issues/152" target="_blank">#152</a> : Handle video and javascript content</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/172" target="_blank">Issue #172</a> and <a href="https://github.com/kiwix/kiwix-js/issues/152" target="_blank">#152</a> : Handle video and javascript content</li>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/126" target="_blank">Issue #126</a> : Load the welcome page at first startup</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/126" target="_blank">Issue #126</a> : Load the welcome page at first startup</li>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/117" target="_blank">Issue #117</a> : Better handle upper/lowercase and accents/diacritics in title search</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/117" target="_blank">Issue #117</a> : Better handle upper/lowercase and accents/diacritics in title search</li>
<li>Performance improvements etc.</li> <li>Performance improvements etc.</li>
</ul> </ul>
Suggestions and patches/pull requests are welcome : the source code is on <a href="https://github.com/kiwix/kiwix-html5" target="_blank">github</a>. Suggestions and patches/pull requests are welcome : the source code is on <a href="https://github.com/kiwix/kiwix-js" target="_blank">github</a>.
The <a href="https://github.com/kiwix/kiwix-html5/issues" target="_blank">bugtracker</a> is on github too. We use it as our roadmap. The <a href="https://github.com/kiwix/kiwix-js/issues" target="_blank">bugtracker</a> is on github too. We use it as our roadmap.
<br />Alternatively, you can send your feedback <a href="mailto:mossroy@mossroy.fr?subject=%5BKiwix%5D%20Feedback%20about%20Kiwix%20HTML5">by email</a>. <br />Alternatively, you can send your feedback <a href="mailto:mossroy@mossroy.fr?subject=%5BKiwix%5D%20Feedback%20about%20Kiwix%20HTML5">by email</a>.
<br />In all cases, please give as much detail as you can : which device you are using, which version of Kiwix, which archive, which articles etc. <br />In all cases, please give as much detail as you can : which device you are using, which version of Kiwix, which archive, which articles etc.
<br /> <br />

View File

@ -29,10 +29,9 @@
define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFilesystemAccess'], define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFilesystemAccess'],
function($, zimArchiveLoader, util, uiUtil, cookies, abstractFilesystemAccess) { function($, zimArchiveLoader, util, uiUtil, cookies, abstractFilesystemAccess) {
// Disable any eval() call in jQuery : it's disabled by CSP in any packaged application /*/ Disable any eval() call in jQuery : it's disabled by CSP in any packaged application
// It happens on some wiktionary archives, because there is some javascript inside the html article // It happens on some wiktionary archives, because there is some javascript inside the html article
// Cf http://forum.jquery.com/topic/jquery-ajax-disable-script-eval // Cf http://forum.jquery.com/topic/jquery-ajax-disable-script-eval
/** This is not needed for UWP and seems to cause problems - GK
jQuery.globalEval = function (code) { jQuery.globalEval = function (code) {
// jQuery believes the javascript has been executed, but we did nothing // jQuery believes the javascript has been executed, but we did nothing
// In any case, that would have been blocked by CSP for package applications // In any case, that would have been blocked by CSP for package applications
@ -43,7 +42,8 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
* Maximum number of articles to display in a search * Maximum number of articles to display in a search
* @type Integer * @type Integer
*/ */
var MAX_SEARCH_RESULT_SIZE = 50; //var MAX_SEARCH_RESULT_SIZE = 50;
var MAX_SEARCH_RESULT_SIZE = 20; //GK - speed up search
/** /**
* @type ZIMArchive * @type ZIMArchive
@ -576,11 +576,13 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("GET", url, true); request.open("GET", url, true);
request.responseType = "blob"; request.responseType = "blob";
request.onload = function (e) { request.onreadystatechange = function () {
if (request.response) { if (request.readyState === XMLHttpRequest.DONE) {
if ((request.status >= 200 && request.status < 300) || request.status === 0) {
// Hack to make this look similar to a file // Hack to make this look similar to a file
request.response.name = url; request.response.name = url;
setLocalArchiveFromFileList([request.response]); setLocalArchiveFromFileList([request.response]);
}
} }
}; };
request.send(null); request.send(null);

View File

@ -25,8 +25,11 @@
require.config({ require.config({
baseUrl: 'js/lib', baseUrl: 'js/lib',
paths: { paths: {
'jquery': 'jquery-2.1.4', //'jquery': 'jquery-2.1.4',
'bootstrap': 'bootstrap' //'jquery': 'jquery-3.2.1',
'jquery': 'jquery-3.2.1.slim', //GK testing
//'bootstrap': 'bootstrap'
'bootstrap': 'bootstrap.min' //GK testing
}, },
shim: { shim: {
'jquery' : { 'jquery' : {

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,8 @@ function enlargeMemory() {
assert(TOTAL_MEMORY <= Math.pow(2, 30)); var oldHEAP8 = HEAP8; var buffer = new ArrayBuffer(TOTAL_MEMORY); Module["HEAP8"] = HEAP8 = new Int8Array(buffer); Module["HEAP16"] = HEAP16 = new Int16Array(buffer); Module["HEAP32"] = HEAP32 = new Int32Array(buffer); Module["HEAPU8"] = HEAPU8 = new Uint8Array(buffer); Module["HEAPU16"] = HEAPU16 = new Uint16Array(buffer); Module["HEAPU32"] = HEAPU32 = new Uint32Array(buffer); Module["HEAPF32"] = HEAPF32 = new Float32Array(buffer); Module["HEAPF64"] = HEAPF64 = new Float64Array(buffer); HEAP8.set(oldHEAP8); var success = _emscripten_replace_memory(buffer); assert(success) assert(TOTAL_MEMORY <= Math.pow(2, 30)); var oldHEAP8 = HEAP8; var buffer = new ArrayBuffer(TOTAL_MEMORY); Module["HEAP8"] = HEAP8 = new Int8Array(buffer); Module["HEAP16"] = HEAP16 = new Int16Array(buffer); Module["HEAP32"] = HEAP32 = new Int32Array(buffer); Module["HEAPU8"] = HEAPU8 = new Uint8Array(buffer); Module["HEAPU16"] = HEAPU16 = new Uint16Array(buffer); Module["HEAPU32"] = HEAPU32 = new Uint32Array(buffer); Module["HEAPF32"] = HEAPF32 = new Float32Array(buffer); Module["HEAPF64"] = HEAPF64 = new Float64Array(buffer); HEAP8.set(oldHEAP8); var success = _emscripten_replace_memory(buffer); assert(success)
} var byteLength; try { byteLength = Function.prototype.call.bind(Object.getOwnPropertyDescriptor(ArrayBuffer.prototype, "byteLength").get) } catch (e) { byteLength = (function (buffer) { return buffer.byteLength }) } } var byteLength; try { byteLength = Function.prototype.call.bind(Object.getOwnPropertyDescriptor(ArrayBuffer.prototype, "byteLength").get) } catch (e) { byteLength = (function (buffer) { return buffer.byteLength }) }
var TOTAL_STACK = Module["TOTAL_STACK"] || 5242880; var TOTAL_STACK = Module["TOTAL_STACK"] || 5242880;
var TOTAL_MEMORY = Module["TOTAL_MEMORY"] || 583425; //GK increase /* var TOTAL_MEMORY = Module["TOTAL_MEMORY"] || 8e7; //GK hex value incorrectly declared */
var TOTAL_MEMORY = Module["TOTAL_MEMORY"] || 0x8e7; /* //Fixes kiwix-js #253; kiwix-js-windows #4 */
var FAST_MEMORY = Module["FAST_MEMORY"] || 2097152; var totalMemory = 64 * 1024; var FAST_MEMORY = Module["FAST_MEMORY"] || 2097152; var totalMemory = 64 * 1024;
while (totalMemory < TOTAL_MEMORY || totalMemory < 2 * TOTAL_STACK) { while (totalMemory < TOTAL_MEMORY || totalMemory < 2 * TOTAL_STACK) {
if (totalMemory < 16 * 1024 * 1024) { totalMemory *= 2 } else { totalMemory += 16 * 1024 * 1024 } if (totalMemory < 16 * 1024 * 1024) { totalMemory *= 2 } else { totalMemory += 16 * 1024 * 1024 }

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="a1a5e0b9-13d4-41fb-810d-518949f03df4" Version="0.2.0.0" Publisher="CN=geoff" ProcessorArchitecture="neutral" /> <Identity Name="a1a5e0b9-13d4-41fb-810d-518949f03df4" Version="0.3.0.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>

View File

@ -279,12 +279,18 @@
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\bootstrap.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\bootstrap.js">
<PackagePath>www\js\lib\bootstrap.js</PackagePath> <PackagePath>www\js\lib\bootstrap.js</PackagePath>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\bootstrap.min.js">
<PackagePath>www\js\lib\bootstrap.min.js</PackagePath>
</AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\cookies.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\cookies.js">
<PackagePath>www\js\lib\cookies.js</PackagePath> <PackagePath>www\js\lib\cookies.js</PackagePath>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\jquery-2.1.4.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\jquery-2.1.4.js">
<PackagePath>www\js\lib\jquery-2.1.4.js</PackagePath> <PackagePath>www\js\lib\jquery-2.1.4.js</PackagePath>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\jquery-3.2.1.slim.js">
<PackagePath>www\js\lib\jquery-3.2.1.slim.js</PackagePath>
</AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\q.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\q.js">
<PackagePath>www\js\lib\q.js</PackagePath> <PackagePath>www\js\lib\q.js</PackagePath>
</AppxPackagedFile> </AppxPackagedFile>

Binary file not shown.

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="a1a5e0b9-13d4-41fb-810d-518949f03df4" Version="0.1.9.0" Publisher="CN=geoff" ProcessorArchitecture="neutral" /> <Identity Name="a1a5e0b9-13d4-41fb-810d-518949f03df4" Version="0.3.0.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>

View File

@ -20,19 +20,19 @@
<WindowsSdkPath> <WindowsSdkPath>
</WindowsSdkPath> </WindowsSdkPath>
<LayoutDir>C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\AppX</LayoutDir> <LayoutDir>C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\AppX</LayoutDir>
<RegisteredManifestChecksum>B827762906D622E5B8CF658654C255EF36579F72B08C8E08811DEC0ACD8C71AD</RegisteredManifestChecksum> <RegisteredManifestChecksum>3F3A982E681E889AE2A5AD292DD7EA55CCC80D8157EC9CCCFCD22590D4576300</RegisteredManifestChecksum>
<RegisteredPackageMoniker>a1a5e0b9-13d4-41fb-810d-518949f03df4_0.1.9.0_neutral__zfxmafgedzx24</RegisteredPackageMoniker> <RegisteredPackageMoniker>a1a5e0b9-13d4-41fb-810d-518949f03df4_0.3.0.0_neutral__zfxmafgedzx24</RegisteredPackageMoniker>
<RegisteredUserModeAppID>a1a5e0b9-13d4-41fb-810d-518949f03df4_zfxmafgedzx24!App</RegisteredUserModeAppID> <RegisteredUserModeAppID>a1a5e0b9-13d4-41fb-810d-518949f03df4_zfxmafgedzx24!App</RegisteredUserModeAppID>
<RegisteredPackageID>a1a5e0b9-13d4-41fb-810d-518949f03df4</RegisteredPackageID> <RegisteredPackageID>a1a5e0b9-13d4-41fb-810d-518949f03df4</RegisteredPackageID>
<RegisteredPackagePublisher>CN=geoff</RegisteredPackagePublisher> <RegisteredPackagePublisher>CN=geoff</RegisteredPackagePublisher>
<RegisteredVersion>0.1.9.0</RegisteredVersion> <RegisteredVersion>0.3.0.0</RegisteredVersion>
<JitOptimizationSuppressed>True</JitOptimizationSuppressed> <JitOptimizationSuppressed>True</JitOptimizationSuppressed>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\AppxManifest.xml"> <AppXManifest Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\AppxManifest.xml">
<PackagePath>AppxManifest.xml</PackagePath> <PackagePath>AppxManifest.xml</PackagePath>
<ReRegisterAppIfChanged>true</ReRegisterAppIfChanged> <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
<Modified>2017-06-16T17:05:03.033</Modified> <Modified>2017-06-25T12:59:43.631</Modified>
</AppXManifest> </AppXManifest>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -300,11 +300,11 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\index.html"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\index.html">
<PackagePath>www\index.html</PackagePath> <PackagePath>www\index.html</PackagePath>
<Modified>2017-06-16T16:26:11.288</Modified> <Modified>2017-06-21T19:37:19.038</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\app.css"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\app.css">
<PackagePath>www\css\app.css</PackagePath> <PackagePath>www\css\app.css</PackagePath>
<Modified>2017-06-16T17:01:38.665</Modified> <Modified>2017-06-19T05:52:18.779</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap-theme.css"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\css\bootstrap-theme.css">
<PackagePath>www\css\bootstrap-theme.css</PackagePath> <PackagePath>www\css\bootstrap-theme.css</PackagePath>
@ -344,11 +344,11 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\app.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\app.js">
<PackagePath>www\js\app.js</PackagePath> <PackagePath>www\js\app.js</PackagePath>
<Modified>2017-06-16T16:31:46.926</Modified> <Modified>2017-06-22T06:07:50.858</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\init.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\init.js">
<PackagePath>www\js\init.js</PackagePath> <PackagePath>www\js\init.js</PackagePath>
<Modified>2017-06-16T16:31:46.927</Modified> <Modified>2017-06-25T09:57:54.599</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\abstractFilesystemAccess.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\abstractFilesystemAccess.js">
<PackagePath>www\js\lib\abstractFilesystemAccess.js</PackagePath> <PackagePath>www\js\lib\abstractFilesystemAccess.js</PackagePath>
@ -388,7 +388,7 @@
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\xzdec.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\xzdec.js">
<PackagePath>www\js\lib\xzdec.js</PackagePath> <PackagePath>www\js\lib\xzdec.js</PackagePath>
<Modified>2017-06-16T16:31:47.326</Modified> <Modified>2017-06-21T19:37:19.170</Modified>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\xzdec_wrapper.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\xzdec_wrapper.js">
<PackagePath>www\js\lib\xzdec_wrapper.js</PackagePath> <PackagePath>www\js\lib\xzdec_wrapper.js</PackagePath>
@ -413,7 +413,7 @@
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\ReverseMap\resources.pri"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\ReverseMap\resources.pri">
<PackagePath>resources.pri</PackagePath> <PackagePath>resources.pri</PackagePath>
<ReRegisterAppIfChanged>true</ReRegisterAppIfChanged> <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
<Modified>2017-06-16T17:05:02.855</Modified> <Modified>2017-06-25T12:59:43.447</Modified>
</AppxPackagedFile> </AppxPackagedFile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -36,7 +36,7 @@
} }
[role=region] > .view-content { [role=region] > .view-content {
margin: 0; margin: 0;
position: relative; position: relative; /*Fixes #250 Random button display bug in W10M */
} }
[role=region] > footer { [role=region] > footer {
background: rgba(0,0,0,.2); background: rgba(0,0,0,.2);

View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>KiwixWebApp</title> <title>Kiwix JS for Windows</title>
<meta name="description" content="Offline Wikipedia reader"> <meta name="description" content="Offline Wikipedia reader">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- <!--
@ -51,7 +51,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand">Kiwix 2.2-WIP</a> <a class="navbar-brand">Kiwix JS 0.x (beta)</a>
</div> </div>
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse"> <div class="collapse navbar-collapse navbar-ex1-collapse">
@ -123,15 +123,15 @@
<h3>Feedback / helping / contributing</h3> <h3>Feedback / helping / contributing</h3>
This application is still a work in progress. There are many bugs and improvements that need to be done. In particular : This application is still a work in progress. There are many bugs and improvements that need to be done. In particular :
<ul> <ul>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/114" target="_blank">Issue #114</a> : Add a way to easily download ZIM files directly to the device</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/114" target="_blank">Issue #114</a> : Add a way to easily download ZIM files directly to the device</li>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/13" target="_blank">Issue #13</a> : All the user interface is in English : I plan to translate it at least in French. If you feel able to translate it in your language, please contact me</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/13" target="_blank">Issue #13</a> : All the user interface is in English : I plan to translate it at least in French. If you feel able to translate it in your language, please contact me</li>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/172" target="_blank">Issue #172</a> and <a href="https://github.com/kiwix/kiwix-html5/issues/152" target="_blank">#152</a> : Handle video and javascript content</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/172" target="_blank">Issue #172</a> and <a href="https://github.com/kiwix/kiwix-js/issues/152" target="_blank">#152</a> : Handle video and javascript content</li>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/126" target="_blank">Issue #126</a> : Load the welcome page at first startup</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/126" target="_blank">Issue #126</a> : Load the welcome page at first startup</li>
<li><a href="https://github.com/kiwix/kiwix-html5/issues/117" target="_blank">Issue #117</a> : Better handle upper/lowercase and accents/diacritics in title search</li> <li><a href="https://github.com/kiwix/kiwix-js/issues/117" target="_blank">Issue #117</a> : Better handle upper/lowercase and accents/diacritics in title search</li>
<li>Performance improvements etc.</li> <li>Performance improvements etc.</li>
</ul> </ul>
Suggestions and patches/pull requests are welcome : the source code is on <a href="https://github.com/kiwix/kiwix-html5" target="_blank">github</a>. Suggestions and patches/pull requests are welcome : the source code is on <a href="https://github.com/kiwix/kiwix-js" target="_blank">github</a>.
The <a href="https://github.com/kiwix/kiwix-html5/issues" target="_blank">bugtracker</a> is on github too. We use it as our roadmap. The <a href="https://github.com/kiwix/kiwix-js/issues" target="_blank">bugtracker</a> is on github too. We use it as our roadmap.
<br />Alternatively, you can send your feedback <a href="mailto:mossroy@mossroy.fr?subject=%5BKiwix%5D%20Feedback%20about%20Kiwix%20HTML5">by email</a>. <br />Alternatively, you can send your feedback <a href="mailto:mossroy@mossroy.fr?subject=%5BKiwix%5D%20Feedback%20about%20Kiwix%20HTML5">by email</a>.
<br />In all cases, please give as much detail as you can : which device you are using, which version of Kiwix, which archive, which articles etc. <br />In all cases, please give as much detail as you can : which device you are using, which version of Kiwix, which archive, which articles etc.
<br /> <br />

View File

@ -29,10 +29,9 @@
define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFilesystemAccess'], define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFilesystemAccess'],
function($, zimArchiveLoader, util, uiUtil, cookies, abstractFilesystemAccess) { function($, zimArchiveLoader, util, uiUtil, cookies, abstractFilesystemAccess) {
// Disable any eval() call in jQuery : it's disabled by CSP in any packaged application /*/ Disable any eval() call in jQuery : it's disabled by CSP in any packaged application
// It happens on some wiktionary archives, because there is some javascript inside the html article // It happens on some wiktionary archives, because there is some javascript inside the html article
// Cf http://forum.jquery.com/topic/jquery-ajax-disable-script-eval // Cf http://forum.jquery.com/topic/jquery-ajax-disable-script-eval
/** This is not needed for UWP and seems to cause problems - GK
jQuery.globalEval = function (code) { jQuery.globalEval = function (code) {
// jQuery believes the javascript has been executed, but we did nothing // jQuery believes the javascript has been executed, but we did nothing
// In any case, that would have been blocked by CSP for package applications // In any case, that would have been blocked by CSP for package applications
@ -43,7 +42,8 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
* Maximum number of articles to display in a search * Maximum number of articles to display in a search
* @type Integer * @type Integer
*/ */
var MAX_SEARCH_RESULT_SIZE = 50; //var MAX_SEARCH_RESULT_SIZE = 50;
var MAX_SEARCH_RESULT_SIZE = 20; //GK - speed up search
/** /**
* @type ZIMArchive * @type ZIMArchive
@ -576,11 +576,13 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("GET", url, true); request.open("GET", url, true);
request.responseType = "blob"; request.responseType = "blob";
request.onload = function (e) { request.onreadystatechange = function () {
if (request.response) { if (request.readyState === XMLHttpRequest.DONE) {
if ((request.status >= 200 && request.status < 300) || request.status === 0) {
// Hack to make this look similar to a file // Hack to make this look similar to a file
request.response.name = url; request.response.name = url;
setLocalArchiveFromFileList([request.response]); setLocalArchiveFromFileList([request.response]);
}
} }
}; };
request.send(null); request.send(null);

View File

@ -25,8 +25,11 @@
require.config({ require.config({
baseUrl: 'js/lib', baseUrl: 'js/lib',
paths: { paths: {
'jquery': 'jquery-2.1.4', //'jquery': 'jquery-2.1.4',
'bootstrap': 'bootstrap' //'jquery': 'jquery-3.2.1',
'jquery': 'jquery-3.2.1.slim', //GK testing
//'bootstrap': 'bootstrap'
'bootstrap': 'bootstrap.min' //GK testing
}, },
shim: { shim: {
'jquery' : { 'jquery' : {

File diff suppressed because one or more lines are too long

View File

@ -318,7 +318,7 @@
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\zimfile.js"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\www\js\lib\zimfile.js">
<PackagePath>www\js\lib\zimfile.js</PackagePath> <PackagePath>www\js\lib\zimfile.js</PackagePath>
</AppxPackagedFile> </AppxPackagedFile>
<AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\resources.pri"> <AppxPackagedFile Include="C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\ReverseMap\resources.pri">
<PackagePath>resources.pri</PackagePath> <PackagePath>resources.pri</PackagePath>
<ReRegisterAppIfChanged>true</ReRegisterAppIfChanged> <ReRegisterAppIfChanged>true</ReRegisterAppIfChanged>
</AppxPackagedFile> </AppxPackagedFile>

View File

@ -66,8 +66,10 @@ www\js\app.js
www\js\init.js www\js\init.js
www\js\lib\abstractFilesystemAccess.js www\js\lib\abstractFilesystemAccess.js
www\js\lib\bootstrap.js www\js\lib\bootstrap.js
www\js\lib\bootstrap.min.js
www\js\lib\cookies.js www\js\lib\cookies.js
www\js\lib\jquery-2.1.4.js www\js\lib\jquery-2.1.4.js
www\js\lib\jquery-3.2.1.slim.js
www\js\lib\q.js www\js\lib\q.js
www\js\lib\require.js www\js\lib\require.js
www\js\lib\uiUtil.js www\js\lib\uiUtil.js

View File

@ -66,8 +66,10 @@ www\js\app.js
www\js\init.js www\js\init.js
www\js\lib\abstractFilesystemAccess.js www\js\lib\abstractFilesystemAccess.js
www\js\lib\bootstrap.js www\js\lib\bootstrap.js
www\js\lib\bootstrap.min.js
www\js\lib\cookies.js www\js\lib\cookies.js
www\js\lib\jquery-2.1.4.js www\js\lib\jquery-2.1.4.js
www\js\lib\jquery-3.2.1.slim.js
www\js\lib\q.js www\js\lib\q.js
www\js\lib\require.js www\js\lib\require.js
www\js\lib\uiUtil.js www\js\lib\uiUtil.js

View File

@ -29,4 +29,4 @@ C:\Users\geoff\Source\Repos\kiwix-html5-windows\bld\Release\qualifiers.txt
C:\Users\geoff\Source\Repos\kiwix-html5-windows\bld\Release\qualifiers.txt.intermediate C:\Users\geoff\Source\Repos\kiwix-html5-windows\bld\Release\qualifiers.txt.intermediate
C:\Users\geoff\Source\Repos\kiwix-html5-windows\bld\Release\MultipleQualifiersPerDimensionFound.txt C:\Users\geoff\Source\Repos\kiwix-html5-windows\bld\Release\MultipleQualifiersPerDimensionFound.txt
C:\Users\geoff\Source\Repos\kiwix-html5-windows\bld\Release\ProjectArchitectures.txt C:\Users\geoff\Source\Repos\kiwix-html5-windows\bld\Release\ProjectArchitectures.txt
C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\resources.pri C:\Users\geoff\Source\Repos\kiwix-html5-windows\bin\Release\ReverseMap\resources.pri