From 9f6e38dd4669de4d5d940deb5027af1f04d4607d Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Mon, 29 Jun 2020 21:58:25 +0100 Subject: [PATCH] Change packaged app to wikpedia_en_100_maxi Former-commit-id: 22d3217768512758c30682b102e6ff3f04f0c827 [formerly 94612e74eb1e14051c2b937d10a3f5c4c4f4d480] Former-commit-id: bba58cc295268dd27f0920e5855e299cee587f7b --- KiwixWebApp.jsproj | 6 +- ....txt => wikipedia_en_100_maxi_2020-06.txt} | 0 .../wikipedia_en_ray_charles_maxi_2020-05.txt | 0 www/A/index.htm | 221 ------------------ www/index.html | 6 +- www/js/app.js | 2 +- www/js/init.js | 6 +- 7 files changed, 10 insertions(+), 231 deletions(-) rename archives/{wikipedia_en_100_2019-01.txt => wikipedia_en_100_maxi_2020-06.txt} (100%) delete mode 100644 archives/wikipedia_en_ray_charles_maxi_2020-05.txt delete mode 100644 www/A/index.htm diff --git a/KiwixWebApp.jsproj b/KiwixWebApp.jsproj index bbb32b1d..0ac27398 100644 --- a/KiwixWebApp.jsproj +++ b/KiwixWebApp.jsproj @@ -71,8 +71,8 @@ OnApplicationRun - - + + @@ -162,7 +162,6 @@ - @@ -292,6 +291,7 @@ + diff --git a/archives/wikipedia_en_100_2019-01.txt b/archives/wikipedia_en_100_maxi_2020-06.txt similarity index 100% rename from archives/wikipedia_en_100_2019-01.txt rename to archives/wikipedia_en_100_maxi_2020-06.txt diff --git a/archives/wikipedia_en_ray_charles_maxi_2020-05.txt b/archives/wikipedia_en_ray_charles_maxi_2020-05.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/www/A/index.htm b/www/A/index.htm deleted file mode 100644 index 90b922c8..00000000 --- a/www/A/index.htm +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - -
Amino acid
 - -
Amphibian
 - -
Animal
 - -
Arabic
 - -
Arachnid
 - -
Archaea
 - -
Archimedes
 - -
Aristotle
 - -
Arthropod
 - -
Association football
 - -
Atom
 - -
Aztecs
 - -
Bill Gates
 - -
Bird
 - -
Birmingham
 - -
Bivalvia
 - -
Bobcat
 - -
Brazil
 - -
Butterfly
 - -
Carl Linnaeus
 - -
Catholic Church
 - -
Charles Darwin
 - -
Charlie Chaplin
 - -
Cougar
 - -
Cretaceous–Paleogene extinction event
 - -
Crustacean
 - -
Dinosaur
 - -
Dodo
 - -
E (mathematical constant)
 - -
Elephant
 - -
Elizabeth II
 - -
English language
 - -
Enzyme
 - -
Euro
 - -
Europe
 - -
Flea
 - -
Fly
 - -
Frog
 - -
Fungus
 - -
Galileo Galilei
 - -
Gene
 - -
Geographic coordinate system
 - -
Germany
 - -
Group (mathematics)
 - -
Hippocrates
 - -
Hippopotamus
 - -
Hong Kong
 - -
Horse
 - -
India
 - -
Jesus
 - -
Johannes Kepler
 - -
Karl Marx
 - -
King Arthur
 - -
Kit (association football)
 - -
Koala
 - -
Lake
 - -
Latin
 - -
Lion
 - -
List of states and territories of the United States
 - -
Louvre
 - -
Mammal
 - -
Mantis
 - -
Martin Luther King Jr.
 - -
Michael Jackson
 - -
Millipede
 - -
Mollusca
 - -
Mosquito
 - -
Moth
 - -
Myocardial infarction
 - -
Noble gas
 - -
Philippines
 - -
Planet
 - -
Precipitation
 - -
President of the United States
 - -
Primate
 - -
Raccoon
 - -
Rodent
 - -
Rosetta Stone
 - -
San Francisco
 - -
Serbia
 - -
Shark
 - -
Solar eclipse
 - -
Spanish language
 - -
Spider
 - -
Starfish
 - -
Termite
 - -
Tiger
 - -
Tree
 - -
U.S. state
 - -
United States
 - -
United States Declaration of Independence
 - -
Virus
 - -
Vitamin
 - -
Wales
 - -
Walt Disney
 - -
William Shakespeare
 - -
Wolf
 -
- - - - \ No newline at end of file diff --git a/www/index.html b/www/index.html index cf16146a..d0906640 100644 --- a/www/index.html +++ b/www/index.html @@ -97,7 +97,7 @@

- This application is packaged with only a sample ZIM archive (about the jazz musician Ray Charles) so that you can get a feel + This application is packaged with only a sample ZIM archive of the top 100 Wikipedia articles so that you can get a feel for how offline Wikipedia browsing works. You will need to downloaded an offline ZIM archive and store it on your device. You can do this from the Configuration page , or else see the About page  for more information.

@@ -111,8 +111,8 @@

Changes in 0.9 (beta)

    -
  • Major upgrade to the title-search algorithm: search is now near-case-insensitive
    • -
  • Included sample ZIM updated to wikipedia_en_ray_charles_maxi_2020-05.zim
    • +
  • Fixed major bug preventing all Kiwix apps accessing latest ZIMs
    • +
  • Included sample ZIM changed to wikipedia_en_100_maxi_2020-06.zim

Full changelog...

diff --git a/www/js/app.js b/www/js/app.js index 5b6cff8a..a7cec905 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -1273,7 +1273,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'images', 'cooki //@TODO - this is initialization code, and should be in init.js (withoug jQuery) $('input:radio[name=cssInjectionMode]').filter('[value="' + params.cssSource + '"]').prop('checked', true); //DEV this hides file selectors if it is a packaged file -- add your own packaged file test to regex below - if (params.packagedFile && !/ray.charles/i.test(params.fileVersion)) { + if (params.packagedFile && !/wikipedia.en.100|ray.charles/i.test(params.fileVersion)) { document.getElementById('packagedAppFileSelectors').style.display = "block"; document.getElementById('hideFileSelectors').style.display = "none"; //document.getElementById('downloadLinksText').style.display = "none"; diff --git a/www/js/init.js b/www/js/init.js index 61bb2162..95280377 100644 --- a/www/js/init.js +++ b/www/js/init.js @@ -43,10 +43,10 @@ var params = {}; */ var state = {}; -params['version'] = "0.9.9.99 Beta"; //DEV: This value is compared to the cookie "version" in order to show first-time info, and the cookie is updated in app.js -params['packagedFile'] = "wikipedia_en_ray_charles.zim"; //For packaged Kiwix JS (e.g. with Wikivoyage file), set this to the filename (for split files, give the first chunk *.zimaa) and place file(s) in default storage +params['version'] = "0.9.9.991 Beta"; //DEV: This value is compared to the cookie "version" in order to show first-time info, and the cookie is updated in app.js +params['packagedFile'] = "wikipedia_en_100_maxi.zim"; //For packaged Kiwix JS (e.g. with Wikivoyage file), set this to the filename (for split files, give the first chunk *.zimaa) and place file(s) in default storage params['archivePath'] = "archives"; //The directory containing the packaged archive(s) (relative to app's root directory) -params['fileVersion'] = "wikipedia_en_ray_charles_maxi_2020-05.zim (1-May-2020)"; //Use generic name for actual file, and give version here +params['fileVersion'] = "wikipedia_en_100_maxi_2020-06.zim (4-Jun-2020)"; //Use generic name for actual file, and give version here params['cachedStartPage'] = false; //If you have cached the start page for quick start, give its URI here params['kiwixDownloadLink'] = "https://download.kiwix.org/zim/"; //Include final slash