Small beautification of the code

This commit is contained in:
kelson42 2017-11-08 20:11:55 +01:00
parent 894ed12f37
commit 905b83b3b1
3 changed files with 3 additions and 3 deletions

View File

@ -181,7 +181,7 @@ void introduceTaskbar(string& content, const string& humanReadableBookId)
"__CONTENT__")); "__CONTENT__"));
} }
content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__"); content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__");
content = replaceRegex(content,replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPE__"); content = replaceRegex(content, replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPED__");
} }
pthread_mutex_unlock(&regexLock); pthread_mutex_unlock(&regexLock);
} }

View File

@ -8,7 +8,7 @@
jk(function() { jk(function() {
jk( "#kiwixsearchbox" ).autocomplete({ jk( "#kiwixsearchbox" ).autocomplete({
source: "__ROOT_LOCATION__/suggest?content=__CONTENT_ESCAPE__", source: "__ROOT_LOCATION__/suggest?content=__CONTENT_ESCAPED__",
dataType: "json", dataType: "json",
cache: false, cache: false,

View File

@ -4,7 +4,7 @@
<div class="kiwix_button_wrapper"> <div class="kiwix_button_wrapper">
<a id="kiwix_serve_taskbar_library_button" href="__ROOT_LOCATION__/"><button>Library</button></a> <a id="kiwix_serve_taskbar_library_button" href="__ROOT_LOCATION__/"><button>Library</button></a>
<a id="kiwix_serve_taskbar_home_button" href="__ROOT_LOCATION__/__CONTENT__/"><button>Home</button></a> <a id="kiwix_serve_taskbar_home_button" href="__ROOT_LOCATION__/__CONTENT__/"><button>Home</button></a>
<a id="kiwix_serve_taskbar_random_button" href="__ROOT_LOCATION__/random?content=__CONTENT_ESCAPE__"><button>Random</button></a> <a id="kiwix_serve_taskbar_random_button" href="__ROOT_LOCATION__/random?content=__CONTENT_ESCAPED__"><button>Random</button></a>
</div> </div>
<div class="kiwix_searchform"> <div class="kiwix_searchform">
<form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform"> <form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform">