smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #907 from kiwix/hash

This commit is contained in:
Matthieu Gautier 2023-03-15 17:13:24 +01:00 committed by GitHub
parent 782a25bba8 174deddf35
commit 6b57ad89b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/skin/i18n/en.json
View File

@ -28,7 +28,7 @@
, "random-page-button-text": "Go to a randomly selected page" , "random-page-button-text": "Go to a randomly selected page"
, "searchbox-tooltip": "Search '{{BOOK_TITLE}}'" , "searchbox-tooltip": "Search '{{BOOK_TITLE}}'"
, "confusion-of-tongues": "Two or more books in different languages would participate in search, which may lead to confusing results." , "confusion-of-tongues": "Two or more books in different languages would participate in search, which may lead to confusing results."
, "welcome-page-overzealous-filter": "No result. Would you like to <a href=\"?lang=\">reset filter</a>?" , "welcome-page-overzealous-filter": "No result. Would you like to <a href=\"#lang=\">reset filter</a>?"
, "powered-by-kiwix-html": "Powered by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>" , "powered-by-kiwix-html": "Powered by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>"
, "search": "Search" , "search": "Search"
, "book-filtering-all-categories": "All categories" , "book-filtering-all-categories": "All categories"

28
static/skin/index.js
View File

@ -1,4 +1,12 @@
(function() { (function() {
class FragmentParams extends URLSearchParams {
constructor(fragment = '') {
if (fragment[0] == '#')
fragment = fragment.substring(1);
super(fragment);
}
}
const root = document.querySelector(`link[type='root']`).getAttribute('href'); const root = document.querySelector(`link[type='root']`).getAttribute('href');
const incrementalLoadingParams = { const incrementalLoadingParams = {
start: 0, start: 0,
@ -14,18 +22,18 @@
let isFetching = false; let isFetching = false;
let noResultInjected = false; let noResultInjected = false;
let filters = getCookie(filterCookieName); let filters = getCookie(filterCookieName);
let params = new URLSearchParams(window.location.search || filters || ''); let params = new FragmentParams(window.location.hash || filters || '');
params.delete('userlang'); params.delete('userlang');
let timer; let timer;
let languages = {}; let languages = {};
let previousScrollTop = Infinity; let previousScrollTop = Infinity;
function updateFeedLink() { function updateFeedLink() {
const inputParams = new URLSearchParams(window.location.search); const inputParams = new FragmentParams(window.location.hash);
const filteredParams = new URLSearchParams(); const filteredParams = new FragmentParams();
for (const [key, value] of inputParams) { for (const [key, value] of inputParams) {
if ( value != '' ) { if ( value != '' ) {
filteredParams.append(key, value); filteredParams.set(key, value);
} }
} }
const feedLink = `${root}/catalog/v2/entries?${filteredParams.toString()}`; const feedLink = `${root}/catalog/v2/entries?${filteredParams.toString()}`;
@ -377,10 +385,10 @@
incrementalLoadingParams.count = viewPortToCount(); incrementalLoadingParams.count = viewPortToCount();
fadeOutDiv.style.display = 'none'; fadeOutDiv.style.display = 'none';
bookOrderMap.clear(); bookOrderMap.clear();
params = new URLSearchParams(window.location.search); params = new FragmentParams(window.location.hash);
if (filterType) { if (filterType) {
params.set(filterType, filterValue); params.set(filterType, filterValue);
window.history.pushState({}, null, `?${params.toString()}`); window.history.pushState({}, null, `#${params.toString()}`);
setCookie(filterCookieName, params.toString(), oneDayDelta); setCookie(filterCookieName, params.toString(), oneDayDelta);
} }
updateFilterColors(); updateFilterColors();
@ -486,6 +494,8 @@
} }
}); });
window.addEventListener('hashchange', () => resetAndFilter());
function updateUIText() { function updateUIText() {
footer.innerHTML = $t("powered-by-kiwix-html"); footer.innerHTML = $t("powered-by-kiwix-html");
const searchText = $t("search"); const searchText = $t("search");
@ -529,15 +539,15 @@
const tagElement = document.getElementsByClassName('tagFilterLabel')[0]; const tagElement = document.getElementsByClassName('tagFilterLabel')[0];
tagElement.addEventListener('click', () => removeTagElement(true)); tagElement.addEventListener('click', () => removeTagElement(true));
if (filters) { if (filters) {
const currentLink = window.location.search; const currentLink = window.location.hash;
const newLink = `?${params.toString()}`; const newLink = `#${params.toString()}`;
if (currentLink != newLink) { if (currentLink != newLink) {
window.history.pushState({}, null, newLink); window.history.pushState({}, null, newLink);
} }
} }
updateVisibleParams(); updateVisibleParams();
document.getElementById('kiwixSearchForm').onsubmit = (event) => {event.preventDefault()}; document.getElementById('kiwixSearchForm').onsubmit = (event) => {event.preventDefault()};
if (!window.location.search) { if (!window.location.hash) {
const browserLang = navigator.language.split('-')[0]; const browserLang = navigator.language.split('-')[0];
const langFilter = document.getElementById('languageFilter'); const langFilter = document.getElementById('languageFilter');
const lang = browserLang.length === 3 ? browserLang : iso6391To3[browserLang]; const lang = browserLang.length === 3 ? browserLang : iso6391To3[browserLang];

4
test/server.cpp
View File

@ -63,7 +63,7 @@ const ResourceCollection resources200Compressible{
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/index.css?cacheid=be514520" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/index.css?cacheid=be514520" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/index.js?cacheid=39705b4f" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/index.js?cacheid=cafa3d61" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" },
@ -284,7 +284,7 @@ R"EXPECTEDRESULT( href="/ROOT%23%3F/skin/index.css?cacheid=be514520"
<script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=b00b12db" defer></script> <script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=b00b12db" defer></script>
<script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script> <script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
<script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script> <script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
<script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=39705b4f" defer></script> <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=cafa3d61" defer></script>
<img src="/ROOT%23%3F/skin/feed.png?cacheid=56a672b1" <img src="/ROOT%23%3F/skin/feed.png?cacheid=56a672b1"
)EXPECTEDRESULT" )EXPECTEDRESULT"
}, },