Skip to content

Fixes to librustdoc javascript (mostly search) #28736

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

Merged
merged 2 commits into from
Oct 3, 2015

Conversation

nagisa
Copy link
Member

@nagisa nagisa commented Sep 29, 2015

No description provided.

@rust-highfive
Copy link
Contributor

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@nagisa
Copy link
Member Author

nagisa commented Sep 29, 2015

This is very likely to conflict with some future version of #28725.

Waiting on the referenced PR to merge; do not review before.

@bors
Copy link
Collaborator

bors commented Oct 2, 2015

☔ The latest upstream changes (presumably #28795) made this pull request unmergeable. Please resolve the merge conflicts.

nagisa added 2 commits October 2, 2015 16:54
Previously only keyup event was looked at, which meant that pasting, cutting and
otherwise changing the input without typing would not catch any updates to the
search query.
@nagisa
Copy link
Member Author

nagisa commented Oct 2, 2015

Ready for merge.

@alexcrichton
Copy link
Member

@bors: r+ f38bc2c

Thanks!

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 3, 2015

📌 Commit f38bc2c has been approved by steveklabnik

@steveklabnik
Copy link
Member

lol whoops i added the plus out of habit

@steveklabnik
Copy link
Member

@bors: r=alexcrichton f38bc2c rollup

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Oct 3, 2015
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Oct 3, 2015
bors added a commit that referenced this pull request Oct 3, 2015
@bors bors merged commit f38bc2c into rust-lang:master Oct 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants