am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit 'e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp
* commit 'e6fed8807f469a91e10b64990a7709482378dfa9':
docs: accept the enter key on key-down, rather than key-up,
diff --git a/tools/droiddoc/templates/assets/search_autocomplete.js b/tools/droiddoc/templates/assets/search_autocomplete.js
index 086674a..4fa47a5 100644
--- a/tools/droiddoc/templates/assets/search_autocomplete.js
+++ b/tools/droiddoc/templates/assets/search_autocomplete.js
@@ -107,11 +107,13 @@
var text = search.value;
// 13 = enter
- if (!kd && (e.keyCode == 13)) {
+ if (e.keyCode == 13) {
document.getElementById("search_filtered_div").className = "no-display";
- if (gSelectedIndex >= 0) {
+ if (kd && gSelectedIndex >= 0) {
window.location = toroot + gMatches[gSelectedIndex].link;
return false;
+ } else if (gSelectedIndex < 0) {
+ return true;
}
}
// 38 -- arrow up