Merge pull request #2608 from nextcloud/artonge/backport/stable30/2605

[stable30] fix: Usage of pushToHistory function on prev/next

css/viewer-main.css

@@ -1,3 +1,3 @@
 /* extracted by css-entry-points-plugin */
-@import './main-yNbwR0sN.chunk.css';
+@import './main-Df4lLTaD.chunk.css';
 @import './logger-B6WZzrWi.chunk.css';

src/files_actions/viewerAction.ts

@@ -37,7 +37,16 @@ async function execAction(node: Node, view: View, dir: string): Promise<boolean|
 	}
 
 	pushToHistory(node, view, dir)
-	window.OCA.Viewer.open({ path: node.path, onPrev: pushToHistory, onNext: pushToHistory, onClose })
+	window.OCA.Viewer.open({
+		path: node.path,
+		onPrev(fileInfo) {
+			pushToHistory(fileInfo, view, dir)
+		},
+		onNext(fileInfo) {
+			pushToHistory(fileInfo, view, dir)
+		},
+		onClose
+	})
 
 	return null
 }

src/views/Viewer.vue

@@ -1020,31 +1020,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)
 		},