summaryrefslogtreecommitdiffstats
path: root/tools/droiddoc/templates-sdk
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2012-12-03 12:58:14 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-03 12:58:15 -0800
commit5c0f9e996a819806e5f088ded011bd30ef9c46d7 (patch)
treec303824370b49c9b61bbb02ace7c273265f6f18d /tools/droiddoc/templates-sdk
parentf88a53d5c309adca37210b86e5eb88a4c2706406 (diff)
parent67d75f16f4c5a51da199f96931e9b6b9c17818c7 (diff)
downloadbuild-5c0f9e996a819806e5f088ded011bd30ef9c46d7.zip
build-5c0f9e996a819806e5f088ded011bd30ef9c46d7.tar.gz
build-5c0f9e996a819806e5f088ded011bd30ef9c46d7.tar.bz2
Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
Diffstat (limited to 'tools/droiddoc/templates-sdk')
-rw-r--r--tools/droiddoc/templates-sdk/assets/js/docs.js19
1 files changed, 10 insertions, 9 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index e15ab84..b5f8946 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -1853,15 +1853,16 @@ function escapeHTML(string) {
/* ######################################################## */
/* Initialize some droiddoc stuff, but only if we're in the reference */
-if ((location.pathname.indexOf("/reference") &&
- !location.pathname.indexOf("/reference-gms/packages.html") &&
- !location.pathname.indexOf("/reference-gcm/packages.html") &&
- !location.pathname.indexOf("/reference/com/google")) == 0) {
- $(document).ready(function() {
- // init available apis based on user pref
- changeApiLevel();
- initSidenavHeightResize()
- });
+if (location.pathname.indexOf("/reference")) {
+ if(!location.pathname.indexOf("/reference-gms/packages.html")
+ && !location.pathname.indexOf("/reference-gcm/packages.html")
+ && !location.pathname.indexOf("/reference/com/google") == 0) {
+ $(document).ready(function() {
+ // init available apis based on user pref
+ changeApiLevel();
+ initSidenavHeightResize()
+ });
+ }
}
var API_LEVEL_COOKIE = "api_level";