Merge pull request #45571 from nextcloud/fix/files-middle-click

nextcloud · Jun 12, 2024 · 6ec6c1f · 6ec6c1f
2 parents e5a6698 + a094ac0
commit 6ec6c1f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue
@@ -30,6 +30,7 @@
 			<FileEntryPreview ref="preview"
 				:source="source"
 				:dragover="dragover"
+				@auxclick.native="execDefaultAction"
 				@click.native="execDefaultAction" />
 
 			<FileEntryName ref="name"
@@ -38,7 +39,8 @@
 				:files-list-width="filesListWidth"
 				:nodes="nodes"
 				:source="source"
-				@click="execDefaultAction" />
+				@auxclick.native="execDefaultAction"
+				@click.native="execDefaultAction" />
 		</td>
 
 		<!-- Actions -->

diff --git a/apps/files/src/components/FileEntry/FileEntryName.vue b/apps/files/src/components/FileEntry/FileEntryName.vue
@@ -26,8 +26,7 @@
 		:aria-hidden="isRenaming"
 		class="files-list__row-name-link"
 		data-cy-files-list-row-name-link
-		v-bind="linkTo.params"
-		@click="$emit('click', $event)">
+		v-bind="linkTo.params">
 		<!-- File name -->
 		<span class="files-list__row-name-text">
 			<!-- Keep the displayName stuck to the extension to avoid whitespace rendering issues-->

diff --git a/apps/files/src/components/FileEntryGrid.vue b/apps/files/src/components/FileEntryGrid.vue
@@ -32,6 +32,7 @@
 				:dragover="dragover"
 				:grid-mode="true"
 				:source="source"
+				@auxclick.native="execDefaultAction"
 				@click.native="execDefaultAction" />
 
 			<FileEntryName ref="name"
@@ -41,7 +42,8 @@
 				:grid-mode="true"
 				:nodes="nodes"
 				:source="source"
-				@click="execDefaultAction" />
+				@auxclick.native="execDefaultAction"
+				@click.native="execDefaultAction" />
 		</td>
 
 		<!-- Actions -->

diff --git a/apps/files/src/components/FileEntryMixin.ts b/apps/files/src/components/FileEntryMixin.ts
@@ -207,7 +207,8 @@ export default defineComponent({
 		},
 
 		execDefaultAction(event) {
-			if (event.ctrlKey || event.metaKey) {
+			// if ctrl+click or middle mouse button, open in new tab
+			if (event.ctrlKey || event.metaKey || event.button === 1) {
 				event.preventDefault()
 				window.open(generateUrl('/f/{fileId}', { fileId: this.fileid }))
 				return false

diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map