From e17a7251c128aee855a75b9ac77ea7104a2d8ef3 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Sun, 27 Aug 2023 16:48:39 +0200
Subject: [PATCH] fixup! fix(files): do not include scripts for merge-index

---
 apps/files/js/fileactions.js                 | 8 ++++++++
 apps/files/lib/Controller/ViewController.php | 1 +
 2 files changed, 9 insertions(+)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index c19440b8209ee..dbb213b7852b7 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -10,6 +10,14 @@
 
 (function() {
 
+	if (!OCA.Files) {
+		/**
+		 * Namespace for the files app
+		 * @namespace OCA.Files
+		 */
+		OCA.Files = {};
+	}
+
 	/**
 	 * Construct a new FileActions instance
 	 * @constructs FileActions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 3d6fd04b00a10..4464384b0c00a 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -218,6 +218,7 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 
 		// Load the files we need
 		\OCP\Util::addStyle('files', 'merged');
+		\OCP\Util::addScript('files', 'fileactions');
 		\OCP\Util::addScript('files', 'main');
 
 		$userId = $this->userSession->getUser()->getUID();