Minor UI improvements
This commit is contained in:
parent
8dbf171eb2
commit
0cdced7cca
|
@ -113,7 +113,7 @@
|
|||
<section id="terminalSection" style="display: none;">
|
||||
<span class="icon major fa-exclamation-triangle"></span>
|
||||
<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>
|
||||
</div>
|
||||
<ul class="actions">
|
||||
|
|
14
renderer.js
14
renderer.js
|
@ -169,7 +169,7 @@ function refreshAvailableFirmwares()
|
|||
basetuneButton.disabled = true;
|
||||
|
||||
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');
|
||||
if (!error && response.statusCode == 200) {
|
||||
|
@ -199,7 +199,7 @@ function refreshAvailableFirmwares()
|
|||
}
|
||||
else if(error)
|
||||
{
|
||||
console.log("Error retrieving available firmwares");
|
||||
console.log("Error retrieving available firmwares: " + error);
|
||||
var newOption = document.createElement('option');
|
||||
if(error.code === 'ETIMEDOUT')
|
||||
{
|
||||
|
@ -212,6 +212,10 @@ function refreshAvailableFirmwares()
|
|||
newOption.innerHTML = "Cannot retrieve firmware list. Check internet connection and restart";
|
||||
}
|
||||
select.appendChild(newOption);
|
||||
|
||||
//Remove the loading spinner
|
||||
loadingSpinner = document.getElementById("fwVersionsSpinner");
|
||||
loadingSpinner.style.display = "none";
|
||||
}
|
||||
else if(response.statusCode == 404)
|
||||
{
|
||||
|
@ -582,12 +586,18 @@ function uploadFW()
|
|||
|
||||
ipcRenderer.on("upload error", (event, code) => {
|
||||
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
|
||||
document.getElementById('terminalSection').style.display = "block";
|
||||
document.getElementById('terminalText').innerHTML = code;
|
||||
spinner.classList.remove('fa-spinner');
|
||||
spinner.classList.add('fa-times');
|
||||
|
||||
|
||||
|
||||
reinstallButton.disabled = false;
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue