speeduino
/
SpeedyLoader
mirror of https://github.com/speeduino/SpeedyLoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor UI improvements

This commit is contained in:
Josh Stewart 2021-07-27 15:29:11 +10:00
parent 8dbf171eb2
commit 0cdced7cca
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -113,7 +113,7 @@
<section id="terminalSection" style="display: none;"> <section id="terminalSection" style="display: none;">
<span class="icon major fa-exclamation-triangle"></span> <span class="icon major fa-exclamation-triangle"></span>
<h3>Terminal Output:</h3> <h3>Terminal Output:</h3>
<pre style="color: silver; background: black; overflow-x: scroll; overflow-y: scroll; height:210px"><span id="terminalText"></span></pre> <pre style="color: silver; background: black; overflow-x: scroll; overflow-y: scroll; height:190px"><span id="terminalText"></span></pre>
</section> </section>
</div> </div>
<ul class="actions"> <ul class="actions">

14
renderer.js
View File

@ -169,7 +169,7 @@ function refreshAvailableFirmwares()
basetuneButton.disabled = true; basetuneButton.disabled = true;
var request = require('request'); var request = require('request');
request.get('http://speeduino.com/fw/versions', {timeout: 10000}, function (error, response, body) request.get('https://speeduino.com/fw/versions', {timeout: 20000}, function (error, response, body)
{ {
select = document.getElementById('versionsSelect'); select = document.getElementById('versionsSelect');
if (!error && response.statusCode == 200) { if (!error && response.statusCode == 200) {
@ -199,7 +199,7 @@ function refreshAvailableFirmwares()
} }
else if(error) else if(error)
{ {
console.log("Error retrieving available firmwares"); console.log("Error retrieving available firmwares: " + error);
var newOption = document.createElement('option'); var newOption = document.createElement('option');
if(error.code === 'ETIMEDOUT') if(error.code === 'ETIMEDOUT')
{ {
@ -212,6 +212,10 @@ function refreshAvailableFirmwares()
newOption.innerHTML = "Cannot retrieve firmware list. Check internet connection and restart"; newOption.innerHTML = "Cannot retrieve firmware list. Check internet connection and restart";
} }
select.appendChild(newOption); select.appendChild(newOption);
//Remove the loading spinner
loadingSpinner = document.getElementById("fwVersionsSpinner");
loadingSpinner.style.display = "none";
} }
else if(response.statusCode == 404) else if(response.statusCode == 404)
{ {
@ -582,12 +586,18 @@ function uploadFW()
ipcRenderer.on("upload error", (event, code) => { ipcRenderer.on("upload error", (event, code) => {
statusText.innerHTML = "Upload to Speeduino failed"; statusText.innerHTML = "Upload to Speeduino failed";
//Hide the donation bar as it makes the terminal go offscreen
document.getElementById('sponsor').style.height = 0;
//Mke the terminal/error section visible //Mke the terminal/error section visible
document.getElementById('terminalSection').style.display = "block"; document.getElementById('terminalSection').style.display = "block";
document.getElementById('terminalText').innerHTML = code; document.getElementById('terminalText').innerHTML = code;
spinner.classList.remove('fa-spinner'); spinner.classList.remove('fa-spinner');
spinner.classList.add('fa-times'); spinner.classList.add('fa-times');
reinstallButton.disabled = false; reinstallButton.disabled = false;
}); });