Merge pull request #210 from hughrun/fix-versions

Fix versions logic and clean up JS file

Author: hughrun

site/static/js/bookwyrm.js

@@ -1,53 +1,46 @@
 document.addEventListener('DOMContentLoaded', () => {
-// LANGUAGE / LOCALIZATION
-// TODO: WHY DOESN'T THIS WORK?
-var languageSelector = document.getElementById("language_selection");
-languageSelector.onchange = function(event) {
-    console.log("changed")
-    // var current_locale = "{{ locale['slug']|safe }}";
-    var current_location = window.location.pathname;
+    const languageSelector = document.getElementById("language_selection");
+    languageSelector.onchange = function(event) {
+        var current_location = window.location.pathname;
+        var locale_index = current_location.indexOf(current_locale);
+        var new_location = "/" + event.target.value;
 
-    var locale_index = current_location.indexOf(current_locale);
-    console.log(locale_index)
-    var new_location = "/" + event.target.value;
-    console.log(new_location)
+        if (locale_index) {
+            // we're in a locale - swap it out
+            new_location = current_location.replace(current_locale, event.target.value)
+        } else {
+            // are we in a version?
+            var regx = /\/v[0-9\.]+/
+            if (regx.test(current_location)) {
+                // split current location
+                arr = current_location.split("/")
+                // insert new locale
+                arr.splice(2, 0, event.target.value.replace("/", ""))
+                // gather it all together again
+                new_location = arr.join("/")
+            } else {
+                new_location += current_location.slice(1);
+            }
+        }
+        window.location = new_location;
+    }
 
-    if (locale_index) {
-        // we're in a locale - swap it out
-        new_location = current_location.replace(current_locale, event.target.value)
-    } else {
-        // are we in a version?
+    // SELECT VERSION
+    var versionSelector = document.getElementById("version_selection");
+    versionSelector.onchange = function(event) {
+        current_version = "{{ current_version|safe }}"
+        var current_location = window.location.pathname;
+        var target_version = event.target.value == "development" ? "" : event.target.value;
+        var arr = current_location.split("/")
         var regx = /\/v[0-9\.]+/
         if (regx.test(current_location)) {
-            // split current location
-            arr = current_location.split("/")
-            // insert new locale
-            arr.splice(2, 0, event.target.value.replace("/", ""))
-            // gather it all together again
-            new_location = arr.join("/")
+            window.location = window.location.href.replace(regx,`${target_version}`)
         } else {
-            new_location += current_location.slice(1);
+            window.location = `/${target_version}${current_location}`
         }
     }
-    window.location = new_location;
-}
-
-// SELECT VERSION
-var versionSelector = document.getElementById("version_selection");
-versionSelector.onchange = function(event) {
-    current_version = "{{ current_version|safe }}"
-    var current_location = window.location.pathname;
-    var target_version = event.target.value == "latest" ? "" : event.target.value;
-    var arr = current_location.split("/")
-    var regx = /\/v[0-9\.]+/
-    if (regx.test(current_location)) {
-        window.location = window.location.href.replace(regx,`${target_version}`)
-    } else {
-        window.location = `/${target_version}${current_location}`
-    }
-}
 
-// SHOW/HIDE MENU
+    // SHOW/HIDE MENU
     // Get all "navbar-burger" elements
     const $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0);
 

templates/layout.html

@@ -157,6 +157,7 @@ <h3 class="title is-6">{{ _("Learn more") }}</h3>
 
 <script>
     var current_locale = "{{ locale['slug']|safe }}";
+    var current_version = "{{ current_version }}";
 </script>
 <script src="/static/js/bookwyrm.js"></script>
 </body>