Fix anchor invalid redirection to search #41950
Merged
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
ollie27
suggested changes
May 12, 2017
src/librustdoc/html/static/main.js
Outdated
| var search = document.getElementById('search'); | ||
| if (hasClass(main, 'content')) { | ||
| addClass(main, 'hidden'); | ||
| } |
There was a problem hiding this comment.
This should be something like the following to avoid shadowing the search function and to add the class to the correct element:
var search_c = document.getElementById('search');
if (hasClass(search_c, 'content')) {
addClass(search_c, 'hidden');
}There was a problem hiding this comment.
This was the issue actually. I thought the variable was limited to the scope, big mistake!
src/librustdoc/html/static/main.js
Outdated
| // perform the search. This will empty the bar if there's | ||
| // nothing there, which lets you really go back to a | ||
| // previous state with nothing in the bar. | ||
| document.getElementsByClassName('search-input')[0].value = params.search; |
There was a problem hiding this comment.
If params.search is undefined this should set the value to "" not "undefined" like it currently does.
src/librustdoc/html/static/main.js
Outdated
| var search = document.getElementById('search'); | ||
| if (hasClass(main, 'content')) { | ||
| addClass(main, 'hidden'); | ||
| if (location.href.indexOf(".html?search=") !== -1) { |
There was a problem hiding this comment.
This would break clearing the search results so should be removed.
There was a problem hiding this comment.
It seems it's still working. So not sure if I tested what you had in mind.
There was a problem hiding this comment.
Oh my bad, I need to test on a non local path.
shepmaster
added
the
S-waiting-on-author
GuillaumeGomez
force-pushed
the
rustdoc-links
branch
from
ff6dd78
to
b09a19b
Compare
|
Updated. |
ollie27
approved these changes
May 12, 2017
GuillaumeGomez
added
S-waiting-on-review
frewsxcv
approved these changes
May 13, 2017
|
@bors r+ rollup |
|
📌 Commit b09a19b has been approved by |
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
May 13, 2017
…wsxcv Fix anchor invalid redirection to search Fixes rust-lang#41933. r? @rust-lang/docs
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
May 14, 2017
…wsxcv Fix anchor invalid redirection to search Fixes rust-lang#41933. r? @rust-lang/docs
bors
added a commit
that referenced
this pull request
May 14, 2017
apiraino
removed
S-waiting-on-review
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 #41933.
r? @rust-lang/docs