diff options
| author | smain@google.com <smain@google.com> | 2015-08-31 21:46:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 21:46:46 +0000 |
| commit | deb3c8c4533035df6bd4dc7e88b400b1d71e7a42 (patch) | |
| tree | 15defd781c71bfe820b6ac6225cba333c6ea0fdb /tools | |
| parent | 29c245e803496625cb3b72719f1cdce8d73de041 (diff) | |
| parent | 77c1ff7bf983ef4622ecb227d4e5b0c75728c28f (diff) | |
| download | build-deb3c8c4533035df6bd4dc7e88b400b1d71e7a42.zip build-deb3c8c4533035df6bd4dc7e88b400b1d71e7a42.tar.gz build-deb3c8c4533035df6bd4dc7e88b400b1d71e7a42.tar.bz2 | |
am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
* commit '77c1ff7bf983ef4622ecb227d4e5b0c75728c28f':
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
Diffstat (limited to 'tools')
| -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(); |