Merge pull request #9 from kiwix/Rebrand-to-Kiwix-JS

Rebrand Kiwix JS - Implemets #8 

Former-commit-id: 97c4e5953b35d834628fd008b4daa8488b18608f [formerly 21df9f05fea0ce2a21f2dc2c90901b1ac5689fc6]
Former-commit-id: 68e24e7f3b3c3fd21bec33d5c4feaa51bd5f19f3
This commit is contained in:
Jaifroid 2017-06-21 20:45:29 +01:00 committed by GitHub
commit 263af6b933
5 changed files with 24 additions and 23 deletions

View File

@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>KiwixWebApp</title>
<title>Kiwix JS for Windows</title>
<meta name="description" content="Offline Wikipedia reader">
<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>
</button>
<a class="navbar-brand">Kiwix 2.2-WIP</a>
<a class="navbar-brand">Kiwix JS 0.x (beta)</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
@ -123,15 +123,15 @@
<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 :
<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-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-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-html5/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/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/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/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-js/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/117" target="_blank">Issue #117</a> : Better handle upper/lowercase and accents/diacritics in title search</li>
<li>Performance improvements etc.</li>
</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>.
The <a href="https://github.com/kiwix/kiwix-html5/issues" target="_blank">bugtracker</a> is on github too. We use it as our roadmap.
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-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 />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 />

View File

@ -32,7 +32,6 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
// 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
// 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 believes the javascript has been executed, but we did nothing
// In any case, that would have been blocked by CSP for package applications
@ -576,11 +575,13 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
var request = new XMLHttpRequest();
request.open("GET", url, true);
request.responseType = "blob";
request.onload = function (e) {
if (request.response) {
request.onreadystatechange = function () {
if (request.readyState === XMLHttpRequest.DONE) {
if ((request.status >= 200 && request.status < 300) || request.status === 0) {
// Hack to make this look similar to a file
request.response.name = url;
setLocalArchiveFromFileList([request.response]);
}
}
};
request.send(null);

View File

@ -6,7 +6,7 @@ function enlargeMemory() {
} 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_MEMORY = Module["TOTAL_MEMORY"] || 8e7; //GK hex value incorrectly declared */
var TOTAL_MEMORY = Module["TOTAL_MEMORY"] || 0x8e7; /* //Fixes kiwix-html5 #253; kiwix-html5-windows #4 */
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;
while (totalMemory < TOTAL_MEMORY || totalMemory < 2 * TOTAL_STACK) {
if (totalMemory < 16 * 1024 * 1024) { totalMemory *= 2 } else { totalMemory += 16 * 1024 * 1024 }

View File

@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>KiwixWebApp</title>
<title>Kiwix JS for Windows</title>
<meta name="description" content="Offline Wikipedia reader">
<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>
</button>
<a class="navbar-brand">Kiwix 2.2-WIP</a>
<a class="navbar-brand">Kiwix JS 0.x (beta)</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
@ -123,15 +123,15 @@
<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 :
<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-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-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-html5/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/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/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/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-js/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/117" target="_blank">Issue #117</a> : Better handle upper/lowercase and accents/diacritics in title search</li>
<li>Performance improvements etc.</li>
</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>.
The <a href="https://github.com/kiwix/kiwix-html5/issues" target="_blank">bugtracker</a> is on github too. We use it as our roadmap.
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-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 />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 />

View File

@ -6,7 +6,7 @@ function enlargeMemory() {
} 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_MEMORY = Module["TOTAL_MEMORY"] || 8e7; //GK hex value incorrectly declared */
var TOTAL_MEMORY = Module["TOTAL_MEMORY"] || 0x8e7; /* //Fixes kiwix-html5 #253; kiwix-html5-windows #4 */
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;
while (totalMemory < TOTAL_MEMORY || totalMemory < 2 * TOTAL_STACK) {
if (totalMemory < 16 * 1024 * 1024) { totalMemory *= 2 } else { totalMemory += 16 * 1024 * 1024 }