Tweak theme query

jsdelivr · Apr 16, 2020 · f89e10f · f89e10f
1 parent f5c2ddf
commit f89e10f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -83,16 +83,13 @@ function generateBodyClass(pathname) {
 
 function selectedTheme(selected) {
     const totalThemes = files.bootswatch4.themes.length;
+    const theme = Number.parseInt(selected, 10);
 
-    if (typeof selected === 'undefined' || selected === '' || Number.isNaN(selected) || selected < 0 || selected >= totalThemes) {
+    if (Number.isNaN(theme) || theme < 0 || theme >= totalThemes) {
         return app.theme;
     }
 
-    const theme = Number.parseInt(selected, 10);
-
-    return theme === 0 || theme ?
-        theme :
-        app.theme;
+    return theme;
 }
 
 function getTheme(selected) {

diff --git a/test/bootswatch4_test.js b/test/bootswatch4_test.js
@@ -46,15 +46,15 @@ describe('bootswatch4', () => {
     });
 
     const invalidQueries = [
-        Number.parseInt(-1, 10),
-        Number.parseInt(500, 10),
-        Number.parseInt('5', 10),
-        Number.parseInt('foobar', 10)
+        -1,
+        500,
+        '5',
+        'foobar'
     ];
 
-    invalidQueries.forEach((i) => {
-        it(`handles invalid theme query parameter (${i})`, (done) => {
-            const invalidUri = helpers.getURI(`bootswatch/?theme=${i}`);
+    invalidQueries.forEach((query) => {
+        it(`handles invalid theme query parameter (${query})`, (done) => {
+            const invalidUri = helpers.getURI(`bootswatch/?theme=${query}`);
             let invalidResponse = {};
 
             helpers.prefetch(invalidUri, (res) => {