fixup! Add LoadViewer event

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Author: skjnldsv

appinfo/app.php

@@ -24,4 +24,4 @@
 namespace OCA\Viewer\AppInfo;
 
 // Query the app instance in the hope it's instantiated exactly once
-OC::$server->query(\OCA\Viewer\AppInfo\Application::class);
+\OC::$server->query(\OCA\Viewer\AppInfo\Application::class);

lib/Listener/LoadViewerScript.php

@@ -26,13 +26,14 @@
 
 use OCA\Viewer\AppInfo\Application;
 use OCA\Viewer\Event\LoadViewer;
+use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
 class LoadViewerScript implements IEventListener {
 	public function handle(Event $event): void {
-		if (!($event instanceof LoadViewer)) {
+		if (!($event instanceof LoadViewer || $event instanceof LoadAdditionalScriptsEvent)) {
 			return;
 		}
 

src/services/Viewer.js

@@ -75,14 +75,14 @@ export default class Viewer {
 	 * Get the current opened file
 	 *
 	 * @memberof Viewer
-	 * @returns {string}
+	 * @returns {string} the currently opened file
 	 */
 	get file() {
 		return this.#state.file
 	}
 
 	/**
-	 * Get the current opened file
+	 * Set the current opened file
 	 *
 	 * @param {string} path the path to open
 	 * @memberof Viewer

src/views/Viewer.vue

@@ -297,7 +297,7 @@ export default {
 				this.updatePreviousNext()
 			} else {
 				console.error(`The following file could not be displayed`, fileName, fileInfo)
-				this.currentFile.failed = true
+				this.close()
 			}
 		},