diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-11-29 05:24:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-29 05:24:23 +0100 |
| commit | 1ad234c3fc67099739ad92ff0020d0179ddc2491 (patch) | |
| tree | 8cb6fd057749448868c30f760f7e34b4392d7260 /src | |
| parent | d5d79ac67bbe359e3a3c8ca841450afd37cd1187 (diff) | |
| parent | 20f389db8905f5609f55fcffe686bf95880f8e7a (diff) | |
| download | rust-1ad234c3fc67099739ad92ff0020d0179ddc2491.tar.gz rust-1ad234c3fc67099739ad92ff0020d0179ddc2491.zip | |
Rollup merge of #105016 - GuillaumeGomez:load-sentence-rustdoc, r=notriddle
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:  cc ``@jsha`` r? ``@notriddle``
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/static/js/main.js | 10 | ||||
| -rw-r--r-- | src/librustdoc/html/static/js/search.js | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js index 7230df36c07..623f46b1096 100644 --- a/src/librustdoc/html/static/js/main.js +++ b/src/librustdoc/html/static/js/main.js @@ -302,13 +302,15 @@ function loadCss(cssUrl) { const params = searchState.getQueryStringParams(); if (params.search !== undefined) { - const search = searchState.outputElement(); - search.innerHTML = "<h3 class=\"search-loading\">" + - searchState.loadingText + "</h3>"; - searchState.showResults(search); + searchState.setLoadingSearch(); loadSearch(); } }, + setLoadingSearch: () => { + const search = searchState.outputElement(); + search.innerHTML = "<h3 class=\"search-loading\">" + searchState.loadingText + "</h3>"; + searchState.showResults(search); + }, }; function getPageId() { diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js index 4999bb35994..23ae4e97082 100644 --- a/src/librustdoc/html/static/js/search.js +++ b/src/librustdoc/html/static/js/search.js @@ -1766,13 +1766,13 @@ function initSearch(rawSearchIndex) { * @param {boolean} [forced] */ function search(e, forced) { - const params = searchState.getQueryStringParams(); - const query = parseQuery(searchState.input.value.trim()); - if (e) { e.preventDefault(); } + const query = parseQuery(searchState.input.value.trim()); + let filterCrates = getFilterCrates(); + if (!forced && query.userQuery === currentResults) { if (query.userQuery.length > 0) { putBackSearch(); @@ -1780,7 +1780,9 @@ function initSearch(rawSearchIndex) { 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, // we override it with the URL query parameter. |
