nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-23 04:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #105016 - GuillaumeGomez:load-sentence-rustdoc, r=notriddle

Browse Source 
Add sentence when rustdoc search is running

This is a small improvement, mostly relevant on big search indexes. As soon as the search starts, it'll display:

![image](https://user-images.githubusercontent.com/3050060/204336014-4660634a-09a0-4d5e-a772-d7e1e810dddf.png)

cc ``@jsha``
r? ``@notriddle``
This commit is contained in:
Matthias Krüger 2022-11-29 05:24:23 +01:00 committed by GitHub
commit 1ad234c3fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustdoc/html/static/js/main.js
View File

@ -302,13 +302,15 @@ function loadCss(cssUrl) {
const params = searchState.getQueryStringParams(); const params = searchState.getQueryStringParams();
if (params.search !== undefined) { if (params.search !== undefined) {
const search = searchState.outputElement(); searchState.setLoadingSearch();
search.innerHTML = "<h3 class=\"search-loading\">" +
searchState.loadingText + "</h3>";
searchState.showResults(search);
loadSearch(); loadSearch();
} }
}, },
setLoadingSearch: () => {
const search = searchState.outputElement();
search.innerHTML = "<h3 class=\"search-loading\">" + searchState.loadingText + "</h3>";
searchState.showResults(search);
},
}; };
function getPageId() { function getPageId() {

10
src/librustdoc/html/static/js/search.js
View File

@ -1766,13 +1766,13 @@ function initSearch(rawSearchIndex) {
* @param {boolean} [forced] * @param {boolean} [forced]
*/ */
function search(e, forced) { function search(e, forced) {
const params = searchState.getQueryStringParams();
const query = parseQuery(searchState.input.value.trim());
if (e) { if (e) {
e.preventDefault(); e.preventDefault();
} }
const query = parseQuery(searchState.input.value.trim());
let filterCrates = getFilterCrates();
if (!forced && query.userQuery === currentResults) { if (!forced && query.userQuery === currentResults) {
if (query.userQuery.length > 0) { if (query.userQuery.length > 0) {
putBackSearch(); putBackSearch();
@ -1780,7 +1780,9 @@ function initSearch(rawSearchIndex) {
return; return;
} }
let filterCrates = getFilterCrates(); searchState.setLoadingSearch();
const params = searchState.getQueryStringParams();
// In case we have no information about the saved crate and there is a URL query parameter, // In case we have no information about the saved crate and there is a URL query parameter,
// we override it with the URL query parameter. // we override it with the URL query parameter.