Reset "focusedByTab" field when doing another search #85506
Merged
+5
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Some changes occurred in HTML/CSS/JS. |
rust-highfive
added
the
S-waiting-on-review
GuillaumeGomez
added
T-rustdoc
|
I updated the search.js on my test page: https://data.estada.ch/rustdoc-nightly_4e3e6db01_2021-05-18/multiplayer_snake/index.html?search=send
|
|
Interesting because it creates a |
|
@dns2utf8 Try again? :) |
dns2utf8
reviewed
May 20, 2021
src/librustdoc/html/static/search.js
Outdated
| var description = document.createElement("div"); | ||
| var spanDesc = document.createElement("span"); | ||
| spanDesc.className = "desc"; | ||
| spanDesc.innerText = item.desc + " "; |
There was a problem hiding this comment.
Suggested change
| spanDesc.innerText = item.desc + " "; | |
| spanDesc.innerText = item.desc + '\u00A0'; |
Suggested change
| spanDesc.innerText = item.desc + " "; | |
| spanDesc.innerText = item.desc; | |
| spanDesc.innerHTML += " "; |
There was a problem hiding this comment.
If this is not split up the & is not a special character
Alternatively, we could use \u00A0 and assign it in one go
|
Nice, I added the NO-BREAK SPACE comment to the lines |
|
It looks like this contains two changes: b8909fc that fixes the bug described in the PR, and 12efcf4569ed756d5859b3660538ff662067c6a8, "generate DOM more securely." Can you say more about what makes this approach more secure? And how it related to |
GuillaumeGomez
force-pushed
the
reset-focusedByTab
branch
from
12efcf4 to
b8909fc
Compare
|
This looks good to me and fixes the focus bug 👍 |
|
@bors r+ |
|
📌 Commit b8909fc has been approved by |
bors
added
S-waiting-on-bors
|
@bors: rollup |
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
May 21, 2021
…r=jsha Reset "focusedByTab" field when doing another search Fixes rust-lang#85467. The problem was simply that we forget to reset the `focusedByTab` field, which was still referring to removed DOM elements. r? `@jsha`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 21, 2021
…laumeGomez Rollup of 4 pull requests Successful merges: - rust-lang#85506 (Reset "focusedByTab" field when doing another search) - rust-lang#85548 (Remove dead toggle JS code) - rust-lang#85550 (facepalm: operator precedence fail on my part.) - rust-lang#85555 (Check for more things in THIR unsafeck) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 29, 2021
…ration, r=jsha Better result dom generation First commit is from rust-lang#85506. We realized in rust-lang#85506 (comment) thanks to `@dns2utf8` that in some cases, the generated search result DOM was invalid. This was not strict enough and the DOM was inserted as a big string, which wasn't great. r? `@jsha`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #85467.
The problem was simply that we forget to reset the
focusedByTabfield, which was still referring to removed DOM elements.r? @jsha