fix: Usage of pushToHistory function on prev/next

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

Hide file tree

Showing 10 changed files with 35 additions and 14 deletions.
diff --git a/css/main-DA7qfHYK.chunk.css b/css/main-DA7qfHYK.chunk.css
diff --git a/css/viewer-main.css b/css/viewer-main.css
@@ -0,0 +1,3 @@
+/* extracted by css-entry-points-plugin */
+@import './main-DA7qfHYK.chunk.css';
+@import './logger-B6WZzrWi.chunk.css';
diff --git a/js/viewer-init.js b/js/viewer-init.js
diff --git a/js/viewer-init.js.map b/js/viewer-init.js.map
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/js/viewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-CDU2njOJ_mjs.js b/js/viewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-CDU2njOJ_mjs.js
diff --git a/js/viewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-CDU2njOJ_mjs.js.map b/js/viewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-CDU2njOJ_mjs.js.map
diff --git a/src/services/FilesActionHandler.js b/src/services/FilesActionHandler.js
@@ -41,7 +41,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
@@ -1016,31 +1016,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)
 		},