fixup! fix(files): do not include scripts for merge-index

nextcloud · Aug 27, 2023 · e17a725 · e17a725
1 parent ae66c40
commit e17a725
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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();