StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 71b28a60: 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

Browse Source 
* commit '71b28a600e52922a7a18b990f256b2fa104d32e8':
  docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654
This commit is contained in:
Scott Main
2012-07-18 20:14:58 -07:00
committed by Android Git Automerger
parent 57267e567f 71b28a600e
commit 3fae8d4e56
1 changed files with 10 additions and 6 deletions
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(); $("#searchResults").slideUp();
$(".search .close").addClass("hide"); $(".search .close").addClass("hide");
location.hash = ''; location.hash = '';
drawOptions.setInput(document.getElementById("searchResults"));
$("#search_autocomplete").val("").blur(); $("#search_autocomplete").val("").blur();
@@ -309,7 +308,6 @@ function hideResults() {
var searchControl; var searchControl;
function loadSearchResults() { function loadSearchResults() {
document.getElementById("search_autocomplete").style.color = "#000"; document.getElementById("search_autocomplete").style.color = "#000";
// create search control // 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 // when an event on the browser history occurs (back, forward, load) requery hash and do search
$(window).hashchange( function(){ $(window).hashchange( function(){
var query = decodeURI(getQuery(location.hash)); // Exit if the hash isn't a search query or there's an error in the query
if (query == "undefined") { if ((location.hash.indexOf("q=") == -1) || (query == "undefined")) {
hideResults(); // If the results pane is open, close it.
return; if (!$("#searchResults").is(":hidden")) {
hideResults();
}
return;
} }
// Otherwise, we have a search to do
var query = decodeURI(getQuery(location.hash));
searchControl.execute(query); searchControl.execute(query);
$('#searchResults').slideDown('slow'); $('#searchResults').slideDown('slow');
$("#search_autocomplete").focus(); $("#search_autocomplete").focus();