Pārlūkot izejas kodu

Various fixes.

Fixed issue where news button could not be tabbed to when news UI is active.
Fixed incorrect java version sorting (now behaves as intended).
Daniel Scalzi 7 gadi atpakaļ
vecāks
revīzija
71cbd109c4
2 mainītis faili ar 6 papildinājumiem un 6 dzēšanām
  1. 5 5
      app/assets/js/assetguard.js
  2. 1 1
      app/assets/js/scripts/landing.js

+ 5 - 5
app/assets/js/assetguard.js

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

+ 1 - 1
app/assets/js/scripts/landing.js

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