p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 022b2bbb: am 59bc4701: am deb3c8c4: am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662 

* commit '022b2bbb144a51d9ec39f66cd03d190cd3fc9108':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
This commit is contained in:
smain@google.com 2015-09-01 16:09:03 +00:00 committed by Android Git Automerger
parent c31d800fa5 022b2bbb14
commit e8a659670e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/droiddoc/templates-sdk/sdkpage.cs
View File

@ -342,7 +342,7 @@ var:sdk.linux_download
<tr> <tr>
<td rowspan="3">Windows</td> <td rowspan="3">Windows</td>
<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 ?>" 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) ><?cs var:studio.win_bundle_exe_download ?></a><br>(Recommended)
</td> </td>
@ -353,7 +353,7 @@ var:sdk.linux_download
<tr> <tr>
<!-- blank TD from Windows rowspan --> <!-- blank TD from Windows rowspan -->
<td> <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 ?>" 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) ><?cs var:studio.win_notools_exe_download ?></a><br>(No SDK tools included)
</td> </td>
@ -364,7 +364,7 @@ var:sdk.linux_download
<tr> <tr>
<!-- blank TD from Windows rowspan --> <!-- blank TD from Windows rowspan -->
<td> <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 ?>" 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> ><?cs var:studio.win_bundle_download ?></a>
</td> </td>
@ -375,7 +375,7 @@ var:sdk.linux_download
<tr> <tr>
<td><nobr>Mac OS X</nobr></td> <td><nobr>Mac OS X</nobr></td>
<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 ?>" 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> ><?cs var:studio.mac_bundle_download ?></a>
</td> </td>
@ -386,7 +386,7 @@ var:sdk.linux_download
<tr> <tr>
<td>Linux</td> <td>Linux</td>
<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 ?>" 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> ><?cs var:studio.linux_bundle_download ?></a>
</td> </td>
@ -450,7 +450,11 @@ var:sdk.linux_download
} }
$("#downloadForRealz").attr('bundle', bundle); $("#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(); $("#tos").show();
$("#landing").hide(); $("#landing").hide();