fix closing dms jumping page to top

dimdenGD · Sep 24, 2023 · e5aeb2a · e5aeb2a
1 parent cdad6f4
commit e5aeb2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/layouts/header/script.js b/layouts/header/script.js
@@ -4,7 +4,7 @@ let inboxData = [];
 let followRequestsData = [];
 let customSet = false;
 let menuFn;
-let notificationsOpened = false;
+let notificationsOpened = false, inboxOpened = false;
 let isDarkModeEnabled = typeof vars !== 'undefined' ? (vars.darkMode || (vars.timeMode && isDark())) : false;
 let activeTweet;
 let seenAlgoTweets = [], algoTweetsChanged = false;
@@ -1090,6 +1090,7 @@ let userDataFunction = async user => {
     }
     document.getElementById('messages').addEventListener('click', async e => {
         e.preventDefault();
+        inboxOpened = true;
         location.hash = '#dm';
 
         let inbox = inboxData;
@@ -1153,9 +1154,10 @@ let userDataFunction = async user => {
             </div>
         `, "inbox-modal", () => {
             if(location.hash === '#dm') {
-                location.hash = "";
+                location.hash = "##";
             }
             tweetUrlToShareInDMs = null;
+            setTimeout(() => inboxOpened = false, 100);
         });
         modal.querySelector('.modal-close').hidden = true;
         const inboxList = modal.querySelector('.inbox-list');

diff --git a/layouts/profile/script.js b/layouts/profile/script.js
@@ -2128,7 +2128,7 @@ setTimeout(async () => {
     });
     window.addEventListener("popstate", async () => {
         if(document.querySelector('.tweet-viewer')) return;
-        if(notificationsOpened) return;
+        if(notificationsOpened || inboxOpened) return;
 
         let path = location.pathname;
         if(path.endsWith("/")) path = path.substring(0, path.length - 1);