Add slide gesture for user sidebar

js/cs.js

@@ -1,7 +1,6 @@
 import "./setPublicPath.js";
 import "./general.js";
 import "./header.js";
-import "./subreddit_sidebar.js";
-import "./user_sidebar.js";
+import "./sidebars.js";
 import "./posts";
 console.log("Content script loaded.");

js/sidebars.js

@@ -0,0 +1,27 @@
+import setupSubredditSidebar from "./subreddit_sidebar.js";
+import setupUserSidebar from "./user_sidebar.js";
+function setupSidebars() {
+    const [toggleSub, subSide] = setupSubredditSidebar();
+    const [toggleUser, userSide] = setupUserSidebar();
+    document.addEventListener("swiped-right", function (e) {
+        // sidebar.classList.remove("active");
+        if (subSide.classList.contains("active")) {
+            toggleSub();
+            return;
+        }
+        if (!userSide.classList.contains("active")) {
+            toggleUser();
+        }
+    });
+    document.addEventListener("swiped-left", function (e) {
+        // sidebar.classList.add("active");
+        if (userSide.classList.contains("active")) {
+            toggleUser();
+            return;
+        }
+        if (!subSide.classList.contains("active")) {
+            toggleSub();
+        }
+    });
+}
+setupSidebars();

js/subreddit_sidebar.js

@@ -1,6 +1,6 @@
 import "swiped-events";
 import "~/css/subreddit_sidebar.css";
-function setupSidebar() {
+export default function setupSidebar() {
     const sidebar = document.createElement("div");
     const sidebarToggle = document.createElement("div");
     const actualSidebar = document.querySelector(".side");
@@ -22,24 +22,12 @@ function setupSidebar() {
         // sidebar.classList.toggle("active");
         activeToggle();
     };
-    document.addEventListener("swiped-right", function (e) {
-        // sidebar.classList.remove("active");
-        if (sidebar.classList.contains("active")) {
-            activeToggle();
-        }
-    });
-    document.addEventListener("swiped-left", function (e) {
-        // sidebar.classList.add("active");
-        if (!sidebar.classList.contains("active")) {
-            activeToggle();
-        }
-    });
     actualSidebar.addEventListener("animationend", () => {
         console.log("Animation ended", sidebar.classList);
         if (sidebar.classList.contains("abouttodie")) {
             sidebar.classList.remove("active");
         }
         sidebar.classList.remove("showingup", "abouttodie");
     });
+    return [activeToggle, sidebar];
 }
-setupSidebar();

js/user.js

@@ -1,8 +1,7 @@
 import "./viewport.js";
 import "./general.js";
 import "./header.js";
-import "./subreddit_sidebar.js";
-import "./user_sidebar.js";
+import "./sidebars.js";
 import "./posts";
 
 console.log("oldlander user.js loaded");

js/user_sidebar.js

@@ -185,7 +185,7 @@ function moveHeaderItems(actualSidebar) {
     };
     actualSidebar.appendChild(logoutItem);
 }
-function setupSidebar() {
+export default function setupSidebar() {
     document.body.classList.remove("with-listing-chooser");
     const sidebar = document.createElement("div");
     const old_sidebar = document.getElementById("user_sidebar");
@@ -241,5 +241,5 @@ function setupSidebar() {
 
     setupMultireddits(actualSidebar);
     setupSubreddits(actualSidebar);
+    return [activeToggle, sidebar];
 }
-setupSidebar();