about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2021-05-20 17:56:58 +0200
committerGitHub <noreply@github.com>2021-05-20 17:56:58 +0200
commit247e2e24ebd427ddeb254cec9337de2803adfa0a (patch)
treef56d953de098627d721a9c62830c288a0ede8859
parent0918348eaf27f20bb998942533f38c99d99155e7 (diff)
parent222126adaf048950af6ef5c854e32a5ce8c02760 (diff)
downloadrust-247e2e24ebd427ddeb254cec9337de2803adfa0a.tar.gz
rust-247e2e24ebd427ddeb254cec9337de2803adfa0a.zip
Rollup merge of #85509 - GuillaumeGomez:search-null-title, r=jsha
Prevent tab title to "null" if the URL is a search one

When we arrive on page with a search parameter in the URL, until the results are displayed, the page title is "null". It's because of this code:

```js
if (params.search !== undefined) {
    var search = searchState.outputElement();
    search.innerHTML = "<h3 style=\"text-align: center;\">" +
       searchState.loadingText + "</h3>";
    searchState.showResults(search);
    loadSearch();
}
```

In `searchState.showResults`, we have this:

```js
document.title = searchState.title;
```

But since it's `null`, we set it as title. This PR fixes it.

r? `@jsha`
-rw-r--r--src/librustdoc/html/static/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 82049492672..1ed94ec109c 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -161,7 +161,7 @@ function hideThemeButtonState() {
         outputElement: function() {
             return document.getElementById("search");
         },
-        title: null,
+        title: document.title,
         titleBeforeSearch: document.title,
         timeout: null,
         // On the search screen, so you remain on the last tab you opened.