diff options
| author | smain@google.com <smain@google.com> | 2015-08-28 16:51:12 -0700 |
|---|---|---|
| committer | smain@google.com <smain@google.com> | 2015-08-28 17:27:47 -0700 |
| commit | 4ffdc8faf2c795027f38b6ef4685dd6d1179878e (patch) | |
| tree | d8c65102f3744a2b6e090aed5800e78af10866ea /tools/droiddoc | |
| parent | 4fc1467949aaf9e6a49a6771ed996e3c2c702314 (diff) | |
| download | build-4ffdc8faf2c795027f38b6ef4685dd6d1179878e.zip build-4ffdc8faf2c795027f38b6ef4685dd6d1179878e.tar.gz build-4ffdc8faf2c795027f38b6ef4685dd6d1179878e.tar.bz2 | |
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions.
bug: 23570662
Change-Id: I7482eddbeffa581307bf7f76b9653de41966b6f9
Diffstat (limited to 'tools/droiddoc')
| -rw-r--r-- | tools/droiddoc/templates-sdk/sdkpage.cs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index 013de59..3a3a9a3 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -342,7 +342,7 @@ var:sdk.linux_download <tr> <td rowspan="3">Windows</td> <td> - <a onclick="return onDownload(this)" id="win-bundle" + <a onclick="return onDownload(this,false,true)" id="win-bundle" href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_exe_download ?>" ><?cs var:studio.win_bundle_exe_download ?></a><br>(Recommended) </td> @@ -353,7 +353,7 @@ var:sdk.linux_download <tr> <!-- blank TD from Windows rowspan --> <td> - <a onclick="return onDownload(this)" + <a onclick="return onDownload(this,false,true)" href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_notools_exe_download ?>" ><?cs var:studio.win_notools_exe_download ?></a><br>(No SDK tools included) </td> @@ -364,7 +364,7 @@ var:sdk.linux_download <tr> <!-- blank TD from Windows rowspan --> <td> - <a onclick="return onDownload(this)" + <a onclick="return onDownload(this,false,true)" href="https://dl.google.com/dl/android/studio/ide-zips/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_download ?>" ><?cs var:studio.win_bundle_download ?></a> </td> @@ -375,7 +375,7 @@ var:sdk.linux_download <tr> <td><nobr>Mac OS X</nobr></td> <td> - <a onclick="return onDownload(this)" id="mac-bundle" + <a onclick="return onDownload(this,false,true)" id="mac-bundle" href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.mac_bundle_download ?>" ><?cs var:studio.mac_bundle_download ?></a> </td> @@ -386,7 +386,7 @@ var:sdk.linux_download <tr> <td>Linux</td> <td> - <a onclick="return onDownload(this)" id="linux-bundle" + <a onclick="return onDownload(this,false,true)" id="linux-bundle" href="https://dl.google.com/dl/android/studio/ide-zips/<?cs var:studio.version ?>/<?cs var:studio.linux_bundle_download ?>" ><?cs var:studio.linux_bundle_download ?></a> </td> @@ -450,7 +450,11 @@ var:sdk.linux_download } $("#downloadForRealz").attr('bundle', bundle); - $("a#downloadForRealz").attr("name", $(link).attr('href')); + if (bundle && !button) { + $("a#downloadForRealz").attr("name", "#" + $(link).attr('id')); + } else { + $("a#downloadForRealz").attr("name", $(link).attr('href')); + } $("#tos").show(); $("#landing").hide(); |