openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev

This commit is contained in:
Scott Main 2012-07-18 16:59:41 -07:00 committed by Android (Google) Code Review
parent 55163c882e 7f527b3f44
commit 71b28a600e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
View File

@ -282,7 +282,6 @@ function hideResults() {
$("#searchResults").slideUp();
$(".search .close").addClass("hide");
location.hash = '';
drawOptions.setInput(document.getElementById("searchResults"));
$("#search_autocomplete").val("").blur();
@ -309,7 +308,6 @@ function hideResults() {
var searchControl;
function loadSearchResults() {
document.getElementById("search_autocomplete").style.color = "#000";
// create search control
@ -397,11 +395,17 @@ function hideResults() {
// when an event on the browser history occurs (back, forward, load) requery hash and do search
$(window).hashchange( function(){
var query = decodeURI(getQuery(location.hash));
if (query == "undefined") {
hideResults();
return;
// Exit if the hash isn't a search query or there's an error in the query
if ((location.hash.indexOf("q=") == -1) || (query == "undefined")) {
// If the results pane is open, close it.
if (!$("#searchResults").is(":hidden")) {
hideResults();
}
return;
}
// Otherwise, we have a search to do
var query = decodeURI(getQuery(location.hash));
searchControl.execute(query);
$('#searchResults').slideDown('slow');
$("#search_autocomplete").focus();