Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify escape usage #64312

Merged
merged 1 commit into from
Sep 9, 2019
Merged

Conversation

GuillaumeGomez
Copy link
Member

Fixes #63443.

I chose to keep the search text when pressing escape so when we focus on the search bar, we got the results again without needing to load them again. I also unified a bit a few things (maybe I should have done it in another commit, sorry...).

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

Yeah, it'd be good to split things into separate commits in the future, but it doesn't matter too much when the changes are so small. Don't forget git add -p exists!

I think the behavior change itself is a bit interesting -- but it seems to match the expectation, I guess. Though e.g. Spotlight on macOS based on a bit of testing will clear the input on first escape, and only exit out if escape is hit on an empty input. Not sure what other similar tools do, though.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 9, 2019

📌 Commit 0d34fe4 has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 9, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 9, 2019
…andling, r=Mark-Simulacrum

Unify escape usage

Fixes rust-lang#63443.

I chose to keep the search text when pressing escape so when we focus on the search bar, we got the results again without needing to load them again. I also unified a bit a few things (maybe I should have done it in another commit, sorry...).

r? @Mark-Simulacrum
bors added a commit that referenced this pull request Sep 9, 2019
Rollup of 5 pull requests

Successful merges:

 - #63468 (Resolve attributes in several places)
 - #64121 (Override `StepBy::{try_fold, try_rfold}`)
 - #64278 (check git in bootstrap.py)
 - #64306 (Fix typo in config.toml.example)
 - #64312 (Unify escape usage)

Failed merges:

r? @ghost
@bors bors merged commit 0d34fe4 into rust-lang:master Sep 9, 2019
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-better-esc-handling branch September 10, 2019 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[rustdoc] on search results, when pressing ESC, either remove text in URL or don't remove text in search bar
3 participants