fix: Usage of pushToHistory function on prev/next

Signed-off-by: Louis Chemineau <[email protected]>
nextcloud · Nov 4, 2024 · eacf38d · eacf38d
1 parent 77c8e49
commit eacf38d
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 11 deletions.
diff --git a/css/main--fK07A8K.chunk.css b/css/main--fK07A8K.chunk.css
diff --git a/css/main-DA7qfHYK.chunk.css b/css/main-DA7qfHYK.chunk.css
diff --git a/css/main-DnH6w7F4.chunk.css b/css/main-DnH6w7F4.chunk.css
diff --git a/css/viewer-main.css b/css/viewer-main.css
@@ -1,3 +1,3 @@
 /* extracted by css-entry-points-plugin */
-@import './main--fK07A8K.chunk.css';
+@import './main-DnH6w7F4.chunk.css';
 @import './logger-B5Yp6f8I.chunk.css';
diff --git a/js/viewer-init.mjs b/js/viewer-init.mjs
diff --git a/js/viewer-init.mjs.map b/js/viewer-init.mjs.map
diff --git a/js/viewer-main.mjs b/js/viewer-main.mjs
diff --git a/js/viewer-main.mjs.map b/js/viewer-main.mjs.map
diff --git a/src/services/FilesActionHandler.ts b/src/services/FilesActionHandler.ts
@@ -40,7 +40,16 @@ function filesActionHandler(node, view, dir) {
 		window.OCP.Files.Router.goToRoute(null, window.OCP.Files.Router.params, newQuery)
 	}
 	pushToHistory(node, view, dir)
-	OCA.Viewer.open({ path, onPrev: pushToHistory, onNext: pushToHistory, onClose })
+	window.OCA.Viewer.open({
+		path,
+		onPrev(fileInfo) {
+			pushToHistory(fileInfo, view, dir)
+		},
+		onNext(fileInfo) {
+			pushToHistory(fileInfo, view, dir)
+		},
+		onClose,
+	})
 }
 
 /**

diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue
@@ -1017,31 +1017,30 @@ export default {
 		 * Open previous available file
 		 */
 		previous() {
-			const oldFileInfo = this.fileList[this.currentIndex]
 			this.currentIndex--
 			if (this.currentIndex < 0) {
 				this.currentIndex = this.fileList.length - 1
 			}
 
 			const fileInfo = this.fileList[this.currentIndex]
 			this.openFileFromList(fileInfo)
-			this.Viewer.onPrev(fileInfo, oldFileInfo)
+			this.Viewer.onPrev(fileInfo)
 			this.updateTitle(this.currentFile.basename)
 		},
 
 		/**
 		 * Open next available file
 		 */
 		next() {
-			const oldFileInfo = this.fileList[this.currentIndex]
 			this.currentIndex++
 			if (this.currentIndex > this.fileList.length - 1) {
 				this.currentIndex = 0
 			}
 
 			const fileInfo = this.fileList[this.currentIndex]
 			this.openFileFromList(fileInfo)
-			this.Viewer.onNext(fileInfo, oldFileInfo)
+			this.Viewer.onNext(fileInfo)
+
 			this.updateTitle(this.currentFile.basename)
 		},