fix: stay in the same position after renaming or deleting (#3039)

filebrowser · Mar 7, 2024 · cdf8def · cdf8def
1 parent e167c3e
commit cdf8def
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/frontend/src/components/prompts/Delete.vue b/frontend/src/components/prompts/Delete.vue
@@ -45,6 +45,7 @@ export default {
     submit: async function () {
       buttons.loading("delete");
 
+      window.sessionStorage.setItem("modified", "true");
       try {
         if (!this.isListing) {
           await api.remove(this.$route.path);

diff --git a/frontend/src/components/prompts/Rename.vue b/frontend/src/components/prompts/Rename.vue
@@ -88,6 +88,7 @@ export default {
       newLink =
         url.removeLastDir(oldLink) + "/" + encodeURIComponent(this.name);
 
+      window.sessionStorage.setItem("modified", "true");
       try {
         await api.move([{ from: oldLink, to: newLink }]);
         if (!this.isListing) {

diff --git a/frontend/src/views/Files.vue b/frontend/src/views/Files.vue
@@ -54,8 +54,7 @@ export default {
     currentView() {
       if (this.req.type == undefined || this.req.isDir) {
         return null;
-      }
-      else if (
+      } else if (
         this.req.type === "text" ||
         this.req.type === "textImmutable"
       ) {
@@ -72,11 +71,11 @@ export default {
     $route: function (to, from) {
       if (from.path.endsWith("/")) { 
         if (to.path.endsWith("/"))   {
-          window.sessionStorage.setItem('listFrozen', "false");
+          window.sessionStorage.setItem("listFrozen", "false");
           this.fetchData();
           return;
         } else {
-          window.sessionStorage.setItem('listFrozen', "true");
+          window.sessionStorage.setItem("listFrozen", "true");
           this.fetchData();
           return;        
         }
@@ -117,7 +116,7 @@ export default {
       this.$store.commit("closeHovers");
 
       // Set loading to true and reset the error.
-      if (window.sessionStorage.getItem('listFrozen') !=="true"){ 
+      if (window.sessionStorage.getItem("listFrozen") !=="true" && window.sessionStorage.getItem("modified") !=="true"){ 
         this.setLoading(true);
       }
       this.error = null;

diff --git a/frontend/src/views/files/Editor.vue b/frontend/src/views/files/Editor.vue
@@ -1,5 +1,9 @@
 <template>
-  <div id="editor-container">
+  <div 
+    id="editor-container"
+    @touchmove.prevent.stop 
+    @wheel.prevent.stop
+  >
     <header-bar>
       <action icon="close" :label="$t('buttons.close')" @action="close()" />
       <title>{{ req.name }}</title>

diff --git a/frontend/src/views/files/Listing.vue b/frontend/src/views/files/Listing.vue
@@ -383,7 +383,7 @@ export default {
   },
   watch: {
     req: function () {
-      if (window.sessionStorage.getItem('listFrozen') !=="true"){
+      if (window.sessionStorage.getItem("listFrozen") !=="true" && window.sessionStorage.getItem("modified") !=="true"){
         // Reset the show value
         this.showLimit = 50;
 
@@ -397,7 +397,8 @@ export default {
         });
       }
       if (this.req.isDir) {
-        window.sessionStorage.setItem('listFrozen', "false"); 
+        window.sessionStorage.setItem("listFrozen", "false");
+        window.sessionStorage.setItem("modified", "false"); 
       }
     },
   },