diff --git a/public/mix-manifest.json b/public/mix-manifest.json index af6ab49c..e410a871 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -14,7 +14,7 @@ "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=9e375c8fcaec14b10a00", "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=3b2fed1501fc820649fc", "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=3bfa406354af87101728", - "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a26505370c645bd9db7c", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=7cd886f4a826e85b3c55", "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=d5b15d31f284a79bddc9", "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=cbf768725addfa84fd27", "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~dd421a96.js": "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~dd421a96.js?id=72906c610ee341a0d055", @@ -64,7 +64,7 @@ "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=ac7360e89c09b3357288", "/chunks/plans.js": "/chunks/plans.js?id=014f3cf4501b851e116a", "/chunks/platform.js": "/chunks/platform.js?id=1bf2c945fc6c35f60caa", - "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=c591d64e7678aa789476", + "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=439ec028343736c5c528", "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js": "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js?id=a1049626cd9960bb3053", "/chunks/profile.js": "/chunks/profile.js?id=a4a4367ee503e9f27b8a", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=bc09d0416b6888d92b50", @@ -74,7 +74,7 @@ "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=bc7de99dc8e0b0c1157e", "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=2bad11bb511160fbb1dd", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=8e52cc8d41e535d2f467", - "/chunks/shared.js": "/chunks/shared.js?id=9c5edf6b014a57a4241c", + "/chunks/shared.js": "/chunks/shared.js?id=e7b47ef886f57942ff9b", "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=3d709eca42cd73a0474a", "/chunks/shared-with-me~chunks/team-folders.js": "/chunks/shared-with-me~chunks/team-folders.js?id=8256c585f8adc7f51773", "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=4c4455872ee87b07b3b1", @@ -102,5 +102,28 @@ "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~d86004d6.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~ch~d86004d6.js?id=b40f5f673ec2ab7de20b", "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js?id=ab29ab0a0c2d5a40b39d", "/vendors~chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/vendors~chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a0fa80db175709ba340a", - "/vendors~chunks/settings.js": "/vendors~chunks/settings.js?id=14f4e0c3881d22ad60af" + "/vendors~chunks/settings.js": "/vendors~chunks/settings.js?id=14f4e0c3881d22ad60af", + "/js/main.c95d7d47778181f0bac0.hot-update.js": "/js/main.c95d7d47778181f0bac0.hot-update.js", + "/js/main.9de9df5f6ee9597a6ba5.hot-update.js": "/js/main.9de9df5f6ee9597a6ba5.hot-update.js", + "/js/main.bfadd671740c7683d263.hot-update.js": "/js/main.bfadd671740c7683d263.hot-update.js", + "/chunks/platform~chunks/shared.4ebe40233617a75055d1.hot-update.js": "/chunks/platform~chunks/shared.4ebe40233617a75055d1.hot-update.js", + "/js/main.9ca61f4f35c0c0e3b705.hot-update.js": "/js/main.9ca61f4f35c0c0e3b705.hot-update.js", + "/js/main.86ce122dcf77d3cba96a.hot-update.js": "/js/main.86ce122dcf77d3cba96a.hot-update.js", + "/js/main.596c6180ee4bc857b531.hot-update.js": "/js/main.596c6180ee4bc857b531.hot-update.js", + "/js/main.4b2cf02093e4928b3cc6.hot-update.js": "/js/main.4b2cf02093e4928b3cc6.hot-update.js", + "/chunks/shared.6fec955c2000f4afeaf3.hot-update.js": "/chunks/shared.6fec955c2000f4afeaf3.hot-update.js", + "/chunks/shared.7df071f9b4c22c9dc04c.hot-update.js": "/chunks/shared.7df071f9b4c22c9dc04c.hot-update.js", + "/chunks/shared.3db5df13aeb79df504fe.hot-update.js": "/chunks/shared.3db5df13aeb79df504fe.hot-update.js", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.a00f0d6cabc1cf5a7ca2.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.a00f0d6cabc1cf5a7ca2.hot-update.js", + "/chunks/platform~chunks/shared.fc45cf8ecbb1307ccdff.hot-update.js": "/chunks/platform~chunks/shared.fc45cf8ecbb1307ccdff.hot-update.js", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.e95fbc985895a2413a77.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.e95fbc985895a2413a77.hot-update.js", + "/chunks/platform~chunks/shared.9922336769f0d2abb0d5.hot-update.js": "/chunks/platform~chunks/shared.9922336769f0d2abb0d5.hot-update.js", + "/chunks/platform~chunks/shared.fa1f89bdc264a2465c08.hot-update.js": "/chunks/platform~chunks/shared.fa1f89bdc264a2465c08.hot-update.js", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d8e34965b0446d5c9eb7.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d8e34965b0446d5c9eb7.hot-update.js", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d95273ecf36d94d8090d.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d95273ecf36d94d8090d.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.4b24e8e9b981dea01880.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.4b24e8e9b981dea01880.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.cd758cc3dbebeaa162a3.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.cd758cc3dbebeaa162a3.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.52270ca5b8fa8d44d7db.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.52270ca5b8fa8d44d7db.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.58202e8adeeef077c866.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.58202e8adeeef077c866.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.f61dd8b776bd43f511c9.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.f61dd8b776bd43f511c9.hot-update.js" } diff --git a/resources/js/App.vue b/resources/js/App.vue index c00868d0..a872316f 100644 --- a/resources/js/App.vue +++ b/resources/js/App.vue @@ -61,7 +61,8 @@ export default { }, methods: { spotlightListener(e) { - if (e.key === 'k' && e.metaKey) { + if (e.key === 'k' && e.metaKey || e.key === 'k' && e.ctrlKey) { + e.preventDefault() events.$emit('spotlight:show'); } }, diff --git a/resources/js/components/FilesView/SearchBar.vue b/resources/js/components/FilesView/SearchBar.vue index 2e9f64ce..b84a5459 100644 --- a/resources/js/components/FilesView/SearchBar.vue +++ b/resources/js/components/FilesView/SearchBar.vue @@ -24,7 +24,7 @@ }, computed: { metaKeyIcon() { - return this.$isApple() ? '⌘' : '⊞' + return this.$isApple() ? '⌘' : 'Ctrl' }, }, } diff --git a/resources/js/components/Spotlight/Spotlight.vue b/resources/js/components/Spotlight/Spotlight.vue index 51ae251c..8e13a7eb 100644 --- a/resources/js/components/Spotlight/Spotlight.vue +++ b/resources/js/components/Spotlight/Spotlight.vue @@ -31,6 +31,7 @@ @keydown.delete="undoFilter" @keydown.enter="showSelected" @keydown.meta="showByShortcut" + @keydown.ctrl="showByShortcut" @keyup.down="onPageDown" @keyup.up="onPageUp" type="text" @@ -480,7 +481,7 @@ export default { return this.user.data.attributes.role === 'admin' }, metaKeyIcon() { - return this.$isApple() ? '⌘' : 'alt' + return this.$isApple() ? '⌘' : 'Ctrl' }, isNotEmptyQuery() { return this.query !== '' diff --git a/resources/js/views/Shared.vue b/resources/js/views/Shared.vue index 35c836a0..6695ec36 100644 --- a/resources/js/views/Shared.vue +++ b/resources/js/views/Shared.vue @@ -109,7 +109,8 @@ }, methods: { spotlightListener(e) { - if (e.key === 'k' && e.metaKey) { + if (e.key === 'k' && e.metaKey || e.key === 'k' && e.ctrlKey) { + e.preventDefault() events.$emit('spotlight:show'); } },