From 9c2b1928558d491c683275d9dafbb1c9f09eb8a9 Mon Sep 17 00:00:00 2001
From: Valters Strods <valters.strods@gmail.com>
Date: Sat, 19 Mar 2016 11:16:23 +0200
Subject: [PATCH] Properly fix the download button

All other <button> elements were already handled by the JS script
so the choice was made to drop the onclick tags on them. Sadly, the
download button was missed. This commit properly fixes that.
---
 _includes/scripts.js | 2 +-
 index.html           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_includes/scripts.js b/_includes/scripts.js
index 0517bc7..0fbf742 100644
--- a/_includes/scripts.js
+++ b/_includes/scripts.js
@@ -27,5 +27,5 @@ function validateAds(){var ads=document.getElementsByClassName('adsbygoogle');va
 function validateForm(){var form=document.getElementById('DownloadForm');form.arch.each('checked',function(el){arch=el.value;});if(!archs.has(arch)||packages[arch]===undefined){return 'arch';}storage.setItem('arch',arch);form.api.each('checked',function(el){api=el.value;});if(!apis.has(api)||packages[arch].apis[api]===undefined){return 'api';}storage.setItem('api',api);form.variant.each('checked',function(el){variant=el.value;});if(!variants.has(variant)||packages[arch].apis[api][variant]===undefined){return 'variant';}storage.setItem('variant',variant);return 'ok';}
 function updateButtons(){var v=validateForm();var ch=window.componentHandler;ch.upgradeDom();var info=document.getElementById('github-latest');if(v==='arch'){info.innerHTML='<div id="github-progressbar" class="mdl-progress mdl-js-progress mdl-progress__indeterminate progress-demo"></div><span class="mdl-typography--caption-color-contrast">querying GitHub API...</span>';}else if(v==='api'){info.innerHTML='<span class="mdl-typography--subhead-color-contrast">Select an Android version</span>';}else if(v==='variant'){info.innerHTML='<span class="mdl-typography--subhead-color-contrast">Select a variant</span>';}else{info.innerHTML='<span class="mdl-typography--headline">'+packages[arch].day+' '+packages[arch].month+' '+packages[arch].year+'</span><br><span class="mdl-typography--subhead">Size: '+packages[arch].apis[api][variant].size;}ch.upgradeDom();var hasApi=function(a){return v!=='arch'&&packages[arch].apis.hasOwnProperty(a);};for(var iApi=0;iApi<apis.length;iApi++){setBoxEnable(apis[iApi],hasApi(apis[iApi]));}setBoxCheck(api,hasApi(api));var hasVariant=function(a){return v!=='arch'&&v!=='api'&&packages[arch].apis[api].hasOwnProperty(a);};for(var iVariant=0;iVariant<variants.length;iVariant++){setBoxEnable(variants[iVariant],hasVariant(variants[iVariant]));}setBoxCheck(variant,hasVariant(variant));setButtonEnable('bdownload',v==='ok');setButtonEnable('bversion',v==='ok'||v==='variant');setButtonEnable('bmd5',v==='ok');setButtonEnable('bolder',v==='ok'||v==='variant'||v==='api');}
 function queryRelease(){document.getElementById('DownloadForm').arch.each('checked',function(el){arch=el.value;});storage.setItem('arch',arch);delete packages[arch];updateButtons();var httpRequest=new XMLHttpRequest();httpRequest.onreadystatechange=function(){if(httpRequest.readyState===XMLHttpRequest.DONE&&httpRequest.status===200){var data=JSON.parse(httpRequest.responseText);var releaseName=data.name.split(' ');packages[releaseName.shift()]={'apis':{},'dateTag':data.tag_name,'year':releaseName.pop(),'month':releaseName.pop(),'day':releaseName.pop()};for(var i=0;i<data.assets.length;i++){var asset=data.assets[i];if(asset.name.substr(asset.name.length-4,4)!=='.zip'){continue;}var assetName=asset.name.split('-');if(packages[assetName[1]].apis[assetName[2]]===undefined){packages[assetName[1]].apis[assetName[2]]={};}packages[assetName[1]].apis[assetName[2]][assetName[3]]={'size':Math.round(asset.size/1024/1024*100)/100+' MiB'};}updateButtons();if(autoDownload){downloadSubmit();autoDownload=false;}}};httpRequest.open('GET','https://api.github.com/repos/opengapps/'+arch+'/releases/latest');try{httpRequest.send();}catch(e){}}
-document.addEventListener('DOMContentLoaded',function(){(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments);};i[r].l=1*new Date();a=s.createElement(o);m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m);})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create','UA-63785067-1','auto');ga('send','pageview','/');window.componentHandler.upgradeDom();for(var iAd=0;iAd<document.getElementsByClassName('adsbygoogle').length;iAd++){try{(window.adsbygoogle||[]).push({});}catch(e){validateAds();break;}}if(getCookie('c')!=='y'){window.componentHandler.upgradeDom();var snackbar=document.getElementsByClassName('mdl-js-snackbar')[0].MaterialSnackbar;snackbar.showSnackbar({message:'We use cookies to share information about your use of our site with our advertising and analytics partner',actionHandler:function(){setCookie('c','y',365);snackbar.cleanup_();},actionText:'Got it!',timeout:60000});}document.addEventListener('click',function(e){var target=e.target||e.srcElement;var href=target.href;if(target.tagName.toLowerCase()==='a'&&href.toLowerCase().substr(0,4)==='http'&&target.getAttribute('href')!=='#'){if(target.target==='_blank'||e.ctrlKey){gaEventOutbound(target.href);}else{e.preventDefault();redirectToUrl(target.href);}}});document.getElementById('bversion').addEventListener('click',versionSubmit);document.getElementById('bmd5').addEventListener('click',md5Submit);document.getElementById('bolder').addEventListener('click',olderSubmit);var inputs=document.getElementsByTagName('input');for(var iInput=0;iInput<inputs.length;iInput++){var input=inputs[iInput];switch(input.name){case 'arch':input.addEventListener('change',queryRelease);break;case 'api':case 'variant':input.addEventListener('change',updateButtons);break;}}queryRelease();if(isApp){var links=document.getElementsByTagName('a');for(var iLink=0;iLink<links.length;iLink++){links[iLink].target='_blank';}var forms=document.getElementsByTagName('form');for(var iForm=0;iForm<forms.length;iForm++){if(forms[iForm].id!=='DownloadForm'){forms[iForm].target='_blank';}}}});
+document.addEventListener('DOMContentLoaded',function(){(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments);};i[r].l=1*new Date();a=s.createElement(o);m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m);})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create','UA-63785067-1','auto');ga('send','pageview','/');window.componentHandler.upgradeDom();for(var iAd=0;iAd<document.getElementsByClassName('adsbygoogle').length;iAd++){try{(window.adsbygoogle||[]).push({});}catch(e){validateAds();break;}}if(getCookie('c')!=='y'){window.componentHandler.upgradeDom();var snackbar=document.getElementsByClassName('mdl-js-snackbar')[0].MaterialSnackbar;snackbar.showSnackbar({message:'We use cookies to share information about your use of our site with our advertising and analytics partner',actionHandler:function(){setCookie('c','y',365);snackbar.cleanup_();},actionText:'Got it!',timeout:60000});}document.addEventListener('click',function(e){var target=e.target||e.srcElement;var href=target.href;if(target.tagName.toLowerCase()==='a'&&href.toLowerCase().substr(0,4)==='http'&&target.getAttribute('href')!=='#'){if(target.target==='_blank'||e.ctrlKey){gaEventOutbound(target.href);}else{e.preventDefault();redirectToUrl(target.href);}}});document.getElementById('bdownload').addEventListener('click',downloadSubmit);document.getElementById('bversion').addEventListener('click',versionSubmit);document.getElementById('bmd5').addEventListener('click',md5Submit);document.getElementById('bolder').addEventListener('click',olderSubmit);var inputs=document.getElementsByTagName('input');for(var iInput=0;iInput<inputs.length;iInput++){var input=inputs[iInput];switch(input.name){case 'arch':input.addEventListener('change',queryRelease);break;case 'api':case 'variant':input.addEventListener('change',updateButtons);break;}}queryRelease();if(isApp){var links=document.getElementsByTagName('a');for(var iLink=0;iLink<links.length;iLink++){links[iLink].target='_blank';}var forms=document.getElementsByTagName('form');for(var iForm=0;iForm<forms.length;iForm++){if(forms[iForm].id!=='DownloadForm'){forms[iForm].target='_blank';}}}});
 window.onload=function(){setTimeout(validateAds,2000);};
diff --git a/index.html b/index.html
index 20b8255..b60e1fb 100755
--- a/index.html
+++ b/index.html
@@ -88,7 +88,7 @@
    </table>
   </form>
   <div class="downloadbuttons">
-   <button id="bdownload" class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" onclick="javascript:downloadSubmit();" disabled><i class="material-icons">file_download</i></button>
+   <button id="bdownload" class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" disabled><i class="material-icons">file_download</i></button>
    <div id="github-latest"><div id="github-progressbar" class="mdl-progress mdl-js-progress mdl-progress__indeterminate progress-demo"></div><span class="mdl-typography--caption-color-contrast">querying GitHub API...</span></div>
    <button id="bversion" class="mdl-button mdl-js-button mdl-button--accent" disabled>Version Information</button><br />
    <button id="bmd5" class="mdl-button mdl-js-button mdl-button--accent" disabled>MD5 Checksum</button><br />