fix filter logic & add @FoamyGuy's formatting

Author: durapensa

assets/javascript/downloads.js

@@ -387,29 +387,39 @@ function shouldDisplayDownload(download, displayedManufacturers, displayedMcufam
 
   if (shouldFilterManufacturers) {
     if (displayedManufacturers.includes(id)) {
-      if (shouldFilterFeatures) {
-        if (displayedFeatures.includes(id)) {
-            shouldDisplay = true;
-        }
+      if (shouldFilterMcufamilies) {
+        if (displayedMcufamilies.includes(id)) {
+          if (shouldFilterFeatures) {
+            if (displayedFeatures.includes(id)) {
+                shouldDisplay = true;
+            }
+          } else {
+          shouldDisplay = true;
+	  }
+	}
+      } else if (shouldFilterFeatures) {
+          if (displayedFeatures.includes(id)) {
+              shouldDisplay = true;
+          }
       } else {
         shouldDisplay = true;
       }
     }
-  } else if (shouldFilterFeatures && displayedFeatures.includes(id)) {
-    shouldDisplay = true;
-  }
-
-  if (shouldFilterMcufamilies) {
+  } else if (shouldFilterMcufamilies) {
     if (displayedMcufamilies.includes(id)) {
       if (shouldFilterFeatures) {
         if (displayedFeatures.includes(id)) {
             shouldDisplay = true;
         }
       } else {
-        shouldDisplay = true;
+         shouldDisplay = true;
       }
     }
-  } else if (shouldFilterFeatures && displayedFeatures.includes(id)) {
+  } else if (shouldFilterFeatures) {
+    if (displayedFeatures.includes(id)) {
+        shouldDisplay = true;
+    }
+  } else {
     shouldDisplay = true;
   }
 

downloads.html

@@ -30,17 +30,19 @@ <h1>Downloads</h1>
           <ul class="content"></ul>
         </fieldset>
       </div>
-      <div class="mcufamilies">
-        <fieldset>
-          <legend>Processor family</legend>
-          <ul class="content"></ul>
-        </fieldset>
-      </div>
-      <div class="features">
-        <fieldset>
-          <legend>Features</legend>
-          <ul class="content"></ul>
-        </fieldset>
+      <div>
+        <div class="features">
+          <fieldset>
+            <legend>Features</legend>
+            <ul class="content"></ul>
+          </fieldset>
+        </div>
+        <div class="mcufamilies">
+          <fieldset>
+            <legend>Processor family</legend>
+            <ul class="content"></ul>
+          </fieldset>
+        </div>
       </div>
       <div class="sort-by">
         <fieldset>