Commit 5729dbfa authored Jan 26, 2010 by Scott Main Committed by Android Git Automerger Jan 26, 2010

am e6fed880: Merge "docs: accept the enter key on key-down, rather than...

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 'e6fed880' into eclair-plus-aosp

* commit 'e6fed880':
  docs: accept the enter key on key-down, rather than key-up,

parents ccd0338c e6fed880

tools/droiddoc/templates/assets/search_autocomplete.js

+4 −2

Original line number	Diff line number	Diff line
		@@ -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