Skip to content

Fixes to librustdoc javascript (mostly search) - #28736

Merged
bors merged 2 commits into
rust-lang:masterfrom
nagisa:rustdocjsfix
Oct 3, 2015
Merged

Fixes to librustdoc javascript (mostly search)#28736
bors merged 2 commits into
rust-lang:masterfrom
nagisa:rustdocjsfix

Conversation

@nagisa

Copy link
Copy Markdown
Member

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

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

@nagisa

Copy link
Copy Markdown
MemberAuthor

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

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

@bors

bors commented Oct 2, 2015

Copy link
Copy Markdown
Collaborator

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

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
Copy Markdown
MemberAuthor

Ready for merge.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ f38bc2c

Thanks!

@steveklabnik

Copy link
Copy Markdown
Contributor

@bors: r+ rollup

@bors

bors commented Oct 3, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit f38bc2c has been approved by steveklabnik

@steveklabnik

Copy link
Copy Markdown
Contributor

lol whoops i added the plus out of habit

@steveklabnik

Copy link
Copy Markdown
Contributor

@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:masterOct 3, 2015
Sign up for freeto 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

@nagisa@rust-highfive@bors@alexcrichton@steveklabnik