nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-22 09:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/exif_metadata'

Browse Source 
# Conflicts:
#	public/mix-manifest.json
#	resources/js/App.vue
#	resources/js/components/FilesView/ImageMetaData.vue
#	resources/js/components/FilesView/InfoSidebar.vue
#	resources/js/components/FilesView/SearchBar.vue
#	resources/js/components/Spotlight/Spotlight.vue
#	resources/js/views/Shared.vue
#	src/Domain/Files/Resources/FileResource.php
This commit is contained in:
Čarodej
2022-02-25 18:23:08 +01:00
parent ab3a307dc1 6fd8ddf680
commit c84850e8d2
16 changed files with 358 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/js/components/Spotlight/Spotlight.vue
View File

@@ -41,6 +41,7 @@
@keydown.delete="undoFilter"
@keydown.enter="showSelected"
@keydown.meta="showByShortcut"
@keydown.ctrl="showByShortcut"
@keyup.down="onPageDown"
@keyup.up="onPageUp"
type="text"
@@ -630,7 +631,7 @@ export default {
return this.user.data.attributes.role === 'admin'
},
metaKeyIcon() {
return this.$isApple() ? '⌘' : 'alt'
return this.$isApple() ? '⌘' : 'Ctrl'
},
isNotEmptyQuery() {
return this.query !== ''