Move archiveReload to the root app as a shared function

GiovanH · Aug 29, 2024 · 6f186df · 6f186df
1 parent e06e0c0
commit 6f186df
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -145,6 +145,17 @@
           webFrame.setZoomLevel(this.zoomLevel)
         }
       },
+      archiveReload() {
+        this.memoizedClearAll()
+
+        this.$root.loadState = "LOADING"
+        this.$nextTick(function () {
+          // Don't show loading screen, "soft" reload
+          // this.$root.loadState = "LOADING"
+          this.$localData.root.applySaveIfPending()
+          ipcRenderer.send('RELOAD_ARCHIVE_DATA')
+        })
+      },
       openJumpbox() {
         if (this.$localData.settings.showAddressBar) {
           document.querySelector('#jumpBox input').select()

diff --git a/src/components/AppMenu/TabBar.vue b/src/components/AppMenu/TabBar.vue
@@ -298,16 +298,7 @@ export default {
       ipcRenderer.invoke('reload')
     },
     archiveReload(){
-      // Should match settings.archiveReload
-      this.memoizedClearAll()
-
-      this.$root.loadState = "LOADING"
-      this.$nextTick(function () {
-        // Don't show loading screen, "soft" reload
-        // this.$root.loadState = "LOADING"
-        this.$localData.root.applySaveIfPending()
-        ipcRenderer.send('RELOAD_ARCHIVE_DATA')
-      })
+      this.$root.app.archiveReload()
     }
   }
 }

diff --git a/src/components/SystemPages/Settings.vue b/src/components/SystemPages/Settings.vue
@@ -826,15 +826,8 @@ export default {
     },
     archiveReload(){
       this.debounce = false 
-      this.memoizedClearAll()
 
-      this.$root.loadState = "LOADING"
-      this.$nextTick(function () {
-        // Don't show loading screen, "soft" reload
-        // this.$root.loadState = "LOADING"
-        this.$localData.root.applySaveIfPending()
-        ipcRenderer.send('RELOAD_ARCHIVE_DATA')
-      })
+      this.$root.app.archiveReload()
     },
     openSubModel: function(mod, info_only=false) {
       this.$refs.modal.openMod(mod, info_only)