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

gotoUrl() takes URLs relative to root location

This commit is contained in:
Veloman Yunkan 2022-12-15 18:21:22 +04:00
parent a10067e6b6
commit c7d8081e9a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
static/skin/viewer.js
View File

@ -43,17 +43,17 @@ function gotoMainPageOfCurrentBook() {
} }
function gotoUrl(url) { function gotoUrl(url) {
contentIframe.src = url; contentIframe.src = root + url;
} }
function gotoRandomPage() { function gotoRandomPage() {
gotoUrl(`${root}/random?content=${currentBook}`); gotoUrl(`/random?content=${currentBook}`);
} }
function performSearch() { function performSearch() {
const searchbox = document.getElementById('kiwixsearchbox'); const searchbox = document.getElementById('kiwixsearchbox');
const q = encodeURIComponent(searchbox.value); const q = encodeURIComponent(searchbox.value);
gotoUrl(`${root}/search?books.name=${currentBook}&pattern=${q}`); gotoUrl(`/search?books.name=${currentBook}&pattern=${q}`);
} }
function suggestionsApiURL() function suggestionsApiURL()
@ -338,9 +338,9 @@ function setupSuggestions() {
element: (item, data) => { element: (item, data) => {
let searchLink; let searchLink;
if (data.value.kind == "path") { if (data.value.kind == "path") {
searchLink = `${root}/${currentBook}/${htmlDecode(data.value.path)}`; searchLink = `/${currentBook}/${htmlDecode(data.value.path)}`;
} else { } else {
searchLink = `${root}/search?content=${encodeURIComponent(currentBook)}&pattern=${encodeURIComponent(htmlDecode(data.value.value))}`; searchLink = `/search?content=${encodeURIComponent(currentBook)}&pattern=${encodeURIComponent(htmlDecode(data.value.value))}`;
} }
const jsAction = `gotoUrl('${searchLink}')`; const jsAction = `gotoUrl('${searchLink}')`;
// Values of the href attribute are assumed by the browser to be // Values of the href attribute are assumed by the browser to be

4
test/server.cpp
View File

@ -69,7 +69,7 @@ const ResourceCollection resources200Compressible{
{ DYNAMIC_CONTENT, "/ROOT/skin/taskbar.css" }, { DYNAMIC_CONTENT, "/ROOT/skin/taskbar.css" },
{ STATIC_CONTENT, "/ROOT/skin/taskbar.css?cacheid=216d6b5d" }, { STATIC_CONTENT, "/ROOT/skin/taskbar.css?cacheid=216d6b5d" },
{ DYNAMIC_CONTENT, "/ROOT/skin/viewer.js" }, { DYNAMIC_CONTENT, "/ROOT/skin/viewer.js" },
{ STATIC_CONTENT, "/ROOT/skin/viewer.js?cacheid=0933a233" }, { STATIC_CONTENT, "/ROOT/skin/viewer.js?cacheid=fa85ec82" },
{ DYNAMIC_CONTENT, "/ROOT/skin/fonts/Poppins.ttf" }, { DYNAMIC_CONTENT, "/ROOT/skin/fonts/Poppins.ttf" },
{ STATIC_CONTENT, "/ROOT/skin/fonts/Poppins.ttf?cacheid=af705837" }, { STATIC_CONTENT, "/ROOT/skin/fonts/Poppins.ttf?cacheid=af705837" },
{ DYNAMIC_CONTENT, "/ROOT/skin/fonts/Roboto.ttf" }, { DYNAMIC_CONTENT, "/ROOT/skin/fonts/Roboto.ttf" },
@ -291,7 +291,7 @@ R"EXPECTEDRESULT( <img src="../skin/download.png?
/* url */ "/ROOT/viewer", /* url */ "/ROOT/viewer",
R"EXPECTEDRESULT( <link type="text/css" href="./skin/taskbar.css?cacheid=216d6b5d" rel="Stylesheet" /> R"EXPECTEDRESULT( <link type="text/css" href="./skin/taskbar.css?cacheid=216d6b5d" rel="Stylesheet" />
<link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" /> <link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
<script type="text/javascript" src="./skin/viewer.js?cacheid=0933a233" defer></script> <script type="text/javascript" src="./skin/viewer.js?cacheid=fa85ec82" defer></script>
<script type="text/javascript" src="./skin/autoComplete.min.js?cacheid=1191aaaf"></script> <script type="text/javascript" src="./skin/autoComplete.min.js?cacheid=1191aaaf"></script>
const blankPageUrl = root + "/skin/blank.html?cacheid=6b1fa032"; const blankPageUrl = root + "/skin/blank.html?cacheid=6b1fa032";
<label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label> <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label>