aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2010-01-25 19:08:36 -0800
committerThe Android Automerger <android-build@android.com>2010-01-25 19:08:36 -0800
commit1625ca82cb5fa43eb4be349ba2d1570be74ec263 (patch)
tree76f0c369d7daec6fa84afc1075cc2657617fa3ca
parent9e316f22ccf766cce1c70dcd6566b5c8608115aa (diff)
parente6fed8807f469a91e10b64990a7709482378dfa9 (diff)
downloadbuild-1625ca82cb5fa43eb4be349ba2d1570be74ec263.tar.gz
Merge branch 'eclair' into eclair-release
-rw-r--r--tools/droiddoc/templates/assets/search_autocomplete.js6
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 086674a0fa..4fa47a5904 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