diff options
| author | smain@google.com <smain@google.com> | 2014-10-10 02:12:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-10 02:12:24 +0000 |
| commit | f0daf562f766d1cf15583e171b94107c193e5db4 (patch) | |
| tree | 54ce5e91f89493935a91c5b4baa7b4e94f2d37db /tools | |
| parent | 17e2c06e8aa92b9d99e8e3a8e6f44a630e9529ad (diff) | |
| parent | 2f077190ab3fa9a4dff8461fec4f875acb07888f (diff) | |
| download | build-f0daf562f766d1cf15583e171b94107c193e5db4.zip build-f0daf562f766d1cf15583e171b94107c193e5db4.tar.gz build-f0daf562f766d1cf15583e171b94107c193e5db4.tar.bz2 | |
Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page" into lmp-dev
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/droiddoc/templates-sdk/assets/js/docs.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js index 2824a3d..3d278c3 100644 --- a/tools/droiddoc/templates-sdk/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk/assets/js/docs.js @@ -2552,6 +2552,9 @@ function offsetScrollForSticky() { // when an event on the browser history occurs (back, forward, load) requery hash and do search $(window).hashchange( function(){ + // Ignore if there's no search bar (some special pages have no header) + if ($("#search-container").length < 1) return; + // If the hash isn't a search query or there's an error in the query, // then adjust the scroll position to account for sticky header, then exit. if ((location.hash.indexOf("q=") == -1) || (query == "undefined")) { |