From 74f3a77fde0966b4ec5951210e9919e7a3f0b574 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Wed, 21 Jun 2017 20:42:17 +0100 Subject: [PATCH] Rebrand Kiwix JS Fixes #8 Former-commit-id: cd1959b2ebb09ecb9b2815f8038b5cb3a7df8ee8 [formerly 1292e90589bfe515e18f8309983563738199f050] Former-commit-id: 185f59c7c12931951bcbaeeaeb65c32e87665620 --- bld/Release/PackageLayout/www/index.html | 18 +++++++++--------- bld/Release/PackageLayout/www/js/app.js | 7 ++++--- bld/Release/PackageLayout/www/js/lib/xzdec.js | 2 +- www/index.html | 18 +++++++++--------- www/js/lib/xzdec.js | 2 +- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/bld/Release/PackageLayout/www/index.html b/bld/Release/PackageLayout/www/index.html index 4ad74463..d711eeb9 100644 --- a/bld/Release/PackageLayout/www/index.html +++ b/bld/Release/PackageLayout/www/index.html @@ -2,7 +2,7 @@ - KiwixWebApp + Kiwix JS for Windows
@@ -123,15 +123,15 @@

Feedback / helping / contributing

This application is still a work in progress. There are many bugs and improvements that need to be done. In particular : - Suggestions and patches/pull requests are welcome : the source code is on github. - The bugtracker is on github too. We use it as our roadmap. + Suggestions and patches/pull requests are welcome : the source code is on github. + The bugtracker is on github too. We use it as our roadmap.
Alternatively, you can send your feedback by email.
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.
diff --git a/bld/Release/PackageLayout/www/js/app.js b/bld/Release/PackageLayout/www/js/app.js index 546d9590..6660e8a9 100644 --- a/bld/Release/PackageLayout/www/js/app.js +++ b/bld/Release/PackageLayout/www/js/app.js @@ -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); diff --git a/bld/Release/PackageLayout/www/js/lib/xzdec.js b/bld/Release/PackageLayout/www/js/lib/xzdec.js index 90507f67..dddd5620 100644 --- a/bld/Release/PackageLayout/www/js/lib/xzdec.js +++ b/bld/Release/PackageLayout/www/js/lib/xzdec.js @@ -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 } diff --git a/www/index.html b/www/index.html index 4ad74463..d711eeb9 100644 --- a/www/index.html +++ b/www/index.html @@ -2,7 +2,7 @@ - KiwixWebApp + Kiwix JS for Windows
@@ -123,15 +123,15 @@

Feedback / helping / contributing

This application is still a work in progress. There are many bugs and improvements that need to be done. In particular :
    -
  • Issue #114 : Add a way to easily download ZIM files directly to the device
    • -
  • Issue #13 : 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
    • -
  • Issue #172 and #152 : Handle video and javascript content
    • -
  • Issue #126 : Load the welcome page at first startup
    • -
  • Issue #117 : Better handle upper/lowercase and accents/diacritics in title search
    • +
  • Issue #114 : Add a way to easily download ZIM files directly to the device
    • +
  • Issue #13 : 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
    • +
  • Issue #172 and #152 : Handle video and javascript content
    • +
  • Issue #126 : Load the welcome page at first startup
    • +
  • Issue #117 : Better handle upper/lowercase and accents/diacritics in title search
  • Performance improvements etc.
- Suggestions and patches/pull requests are welcome : the source code is on github. - The bugtracker is on github too. We use it as our roadmap. + Suggestions and patches/pull requests are welcome : the source code is on github. + The bugtracker is on github too. We use it as our roadmap.
Alternatively, you can send your feedback by email.
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.
diff --git a/www/js/lib/xzdec.js b/www/js/lib/xzdec.js index 90507f67..dddd5620 100644 --- a/www/js/lib/xzdec.js +++ b/www/js/lib/xzdec.js @@ -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 }