diff options
| author | Scott Main <smain@google.com> | 2010-01-25 15:39:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-25 15:39:40 -0800 |
| commit | e6fed8807f469a91e10b64990a7709482378dfa9 (patch) | |
| tree | c1f0431cca2610f74f8891d739bf2129f2ca4429 /tools/droiddoc/templates/assets | |
| parent | e749b5a71abe9c3659921c50cc4468a1a4f984f5 (diff) | |
| parent | 9033c1268889c8561d4d5ea0e0836079d7c31a94 (diff) | |
| download | build-e6fed8807f469a91e10b64990a7709482378dfa9.zip build-e6fed8807f469a91e10b64990a7709482378dfa9.tar.gz build-e6fed8807f469a91e10b64990a7709482378dfa9.tar.bz2 | |
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
Diffstat (limited to 'tools/droiddoc/templates/assets')
| -rw-r--r-- | tools/droiddoc/templates/assets/search_autocomplete.js | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ function search_changed(e, kd, toroot) 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 |