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

Various fixes.

Browse Source 
Fixed issue where news button could not be tabbed to when news UI is active.
Fixed incorrect java version sorting (now behaves as intended).
This commit is contained in:
Daniel Scalzi 2018-05-15 02:30:26 -04:00
parent d2c435ce51
commit 71cbd109c4
No known key found for this signature in database
GPG Key ID: 5CA2F145B63535F9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/js/assetguard.js
View File

@ -1019,22 +1019,22 @@ class AssetGuard extends EventEmitter {
// Same version, give priority to JRE. // Same version, give priority to JRE.
if(a.execPath.toLowerCase().indexOf('jdk') > -1){ if(a.execPath.toLowerCase().indexOf('jdk') > -1){
return 1 return b.execPath.toLowerCase().indexOf('jdk') > -1 ? 0 : 1
} else { } else {
return b.execPath.toLowerCase().indexOf('jdk') > -1 ? 0 : -1 return -1
} }
} else { } else {
return a.version.build > b.version.build ? 1 : -1 return a.version.build > b.version.build ? -1 : 1
} }
} else { } else {
return a.version.update > b.version.update ? 1 : -1 return a.version.update > b.version.update ? -1 : 1
} }
} else { } else {
return a.version.major > b.version.major ? 1 : -1 return a.version.major > b.version.major ? -1 : 1
} }
}) })

2
app/assets/js/scripts/landing.js
View File

@ -737,7 +737,7 @@ document.getElementById('newsButton').onclick = () => {
$("#newsContainer *").attr('tabindex', '-1') $("#newsContainer *").attr('tabindex', '-1')
} else { } else {
$("#landingContainer *").attr('tabindex', '-1') $("#landingContainer *").attr('tabindex', '-1')
$("#newsContainer, #newsContainer *").removeAttr('tabindex') $("#newsContainer, #newsContainer *, #lower, #lower #center *").removeAttr('tabindex')
} }
slide_(!newsActive) slide_(!newsActive)
newsActive = !newsActive newsActive = !newsActive