summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-10-04 15:05:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-04 15:05:43 -0700
commit87d5004d3b62441a55b2aba870e4276af6c771eb (patch)
tree4f67ede532b1a3206d784f1829702b7b27c773e8 /docs
parent2ecf3f5e00ea2ac630ffb405baba33113596cf38 (diff)
parente9e1cdd556b40a04637b7de3d839b2a596df47e3 (diff)
downloadframeworks_base-87d5004d3b62441a55b2aba870e4276af6c771eb.zip
frameworks_base-87d5004d3b62441a55b2aba870e4276af6c771eb.tar.gz
frameworks_base-87d5004d3b62441a55b2aba870e4276af6c771eb.tar.bz2
am e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair * commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3': decode the search string before putting it into the search control.
Diffstat (limited to 'docs')
-rw-r--r--docs/html/search.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/search.jd b/docs/html/search.jd
index 838af03..8032b22 100644
--- a/docs/html/search.jd
+++ b/docs/html/search.jd
@@ -94,9 +94,9 @@ page.title=Search Results
// when an event on the browser history occurs (back, forward, load) perform a search
$(window).history(function(e, hash) {
- var query = getQuery(hash);
+ var query = decodeURI(getQuery(hash));
searchControl.execute(query);
- $("#searchTitle").html("search results for <em>" + decodeURI(query) + "</em>");
+ $("#searchTitle").html("search results for <em>" + query + "</em>");
});
// forcefully regain key-up event control (previously jacked by search api)