Skirda/SkirdaElectronLauncher
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Minor fixes for the Java download error overlay.

Browse Source
This commit is contained in:
Daniel Scalzi 2018-04-07 18:24:13 -04:00
parent 0a79634b8a
commit 5a8ae0485a
No known key found for this signature in database
GPG Key ID: 5CA2F145B63535F9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/js/actionbinder.js
View File

@ -214,13 +214,11 @@ function asyncSystemScan(launchAfter = true){
sysAEx.on('message', (m) => { sysAEx.on('message', (m) => {
if(m.content === 'validateJava'){ if(m.content === 'validateJava'){
//m.result = null
if(m.result == null){ if(m.result == null){
// If the result is null, no valid Java installation was found. // If the result is null, no valid Java installation was found.
// Show this information to the user. // Show this information to the user.
setOverlayContent( setOverlayContent(
'No Compatible<br>Java Installation Found..', 'No Compatible<br>Java Installation Found',
'In order to join WesterosCraft, you need a 64-bit installation of Java 8. Would you like us to install a copy? By installing, you accept <a href="http://www.oracle.com/technetwork/java/javase/terms/license/index.html">Oracle\'s license agreement</a>.', 'In order to join WesterosCraft, you need a 64-bit installation of Java 8. Would you like us to install a copy? By installing, you accept <a href="http://www.oracle.com/technetwork/java/javase/terms/license/index.html">Oracle\'s license agreement</a>.',
'Install Java' 'Install Java'
) )
@ -256,11 +254,14 @@ function asyncSystemScan(launchAfter = true){
// Oracle JRE enqueue failed. Probably due to a change in their website format. // Oracle JRE enqueue failed. Probably due to a change in their website format.
// User will have to follow the guide to install Java. // User will have to follow the guide to install Java.
setOverlayContent( setOverlayContent(
'Yikes!<br>Java download failed.', 'Unexpected Issue:<br>Java Download Failed',
'Unfortunately we\'ve encountered an issue while attempting to install Java. You will need to install a copy yourself. Please check out <a href="http://westeroscraft.wikia.com/wiki/Troubleshooting_Guide">this guide</a> for more details and instructions.', 'Unfortunately we\'ve encountered an issue while attempting to install Java. You will need to manually install a copy. Please check out our <a href="http://westeroscraft.wikia.com/wiki/Troubleshooting_Guide">Troubleshooting Guide</a> for more details and instructions.',
'Got it' 'I Understand'
) )
setOverlayHandler(null) setOverlayHandler(() => {
toggleOverlay(false)
toggleLaunchArea(false)
})
toggleOverlay(true) toggleOverlay(true)
sysAEx.disconnect() sysAEx.disconnect()