From b1a6fc3bf25768e1262ae77b805f0b1e2e7babb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Fri, 29 Oct 2021 16:38:52 +0200 Subject: [PATCH] spotlight fix --- public/mix-manifest.json | 21 +++++++++++++++---- .../js/components/FilesView/ItemHandler.vue | 1 + .../js/components/FilesView/ItemList.vue | 7 ++++--- .../js/components/Spotlight/Spotlight.vue | 10 ++++++--- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 93222767..6e62197b 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -8,11 +8,11 @@ "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=1d731f1c4a9daecb2a99", "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js?id=5841d65172536a8a9bdc", "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js?id=d7ad2fc844fa24b1fc50", - "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=a27cfff7a3c09f514f0e", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=c04ac5a9cb0f4d2987d4", "/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=a935f1a48a77c1ab8198", "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=90270d0c5aeb5c50dacf", "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=a980b59887f54d19130b", - "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=c8041122e6522ffa6dd0", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a44cb148fdebc8d5af9f", "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6177253e847903d63adc", "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=aa284736dda7647d5c9e", "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=6bd4516589f23ec25ae6", @@ -40,7 +40,7 @@ "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=df7397408805a1cc93fa", "/chunks/files.js": "/chunks/files.js?id=357a135d5a75ba88ce23", "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=d0a2e05e3e243b2e2c4e", - "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=45e9d38810bb4029d177", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=f9381f8452e76e1f8fc5", "/chunks/files~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js": "/chunks/files~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js?id=4b8864f9265f55f61cf7", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=533962a06f477f6e046b", "/chunks/homepage.js": "/chunks/homepage.js?id=b89dd81804b8a0bd3f0b", @@ -320,5 +320,18 @@ "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.7cfea52210f8a966cb5a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.7cfea52210f8a966cb5a.hot-update.js", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.48ca0294b3324152aed2.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.48ca0294b3324152aed2.hot-update.js", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.42e5c68d80c7e65aea5e.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.42e5c68d80c7e65aea5e.hot-update.js", - "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.6b7f883dc9c6b9e172c2.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.6b7f883dc9c6b9e172c2.hot-update.js" + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.6b7f883dc9c6b9e172c2.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.6b7f883dc9c6b9e172c2.hot-update.js", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.59060391af4e93450379.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.59060391af4e93450379.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.8989f06c17f1aed0365f.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.8989f06c17f1aed0365f.hot-update.js", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.047e087dc12421701d0d.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.047e087dc12421701d0d.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.a0292e976a2caf2a74e9.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.a0292e976a2caf2a74e9.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.4337ff5efee0c27f1792.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.4337ff5efee0c27f1792.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.8c7876951a191def486e.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.8c7876951a191def486e.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.55a4ff1858e612b5f681.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.55a4ff1858e612b5f681.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.013310ccc0fd83cc7106.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.013310ccc0fd83cc7106.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.2a6e37b99af6df587c71.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.2a6e37b99af6df587c71.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.047934a61f80b6bfad66.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.047934a61f80b6bfad66.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.0f7596f019518de2fdaa.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.0f7596f019518de2fdaa.hot-update.js", + "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.ad5a083f6d48882cb237.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.ad5a083f6d48882cb237.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.db7c8649e61404696f51.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.db7c8649e61404696f51.hot-update.js" } diff --git a/resources/js/components/FilesView/ItemHandler.vue b/resources/js/components/FilesView/ItemHandler.vue index 0177e1dc..f83151e2 100644 --- a/resources/js/components/FilesView/ItemHandler.vue +++ b/resources/js/components/FilesView/ItemHandler.vue @@ -4,6 +4,7 @@ v-if="itemViewType === 'list'" :entry="item" :highlight="true" + :mobile-handler="true" @mouseup.stop.native="clickFilter" @dragstart.native="$emit('dragstart')" @drop.native="drop()" diff --git a/resources/js/components/FilesView/ItemList.vue b/resources/js/components/FilesView/ItemList.vue index cbffe0db..ab6bc982 100644 --- a/resources/js/components/FilesView/ItemList.vue +++ b/resources/js/components/FilesView/ItemList.vue @@ -23,14 +23,14 @@ - +
- + {{ itemName }} @@ -55,7 +55,7 @@
-
+
@@ -84,6 +84,7 @@ LinkIcon, }, props: [ + 'mobileHandler', 'highlight', 'entry', ], diff --git a/resources/js/components/Spotlight/Spotlight.vue b/resources/js/components/Spotlight/Spotlight.vue index 09586f47..96aff4c5 100644 --- a/resources/js/components/Spotlight/Spotlight.vue +++ b/resources/js/components/Spotlight/Spotlight.vue @@ -10,7 +10,7 @@
- +
esc
@@ -27,7 +27,8 @@ :entry="item" :class="{'is-clicked': i === index}" :highlight="false" - @click.native="exit" + :mobile-handler="false" + @click.native="openItem(item)" />
{{ i === 0 ? '↵' : metaKeyIcon + i}} @@ -100,9 +101,12 @@ export default { } }, showSelected() { - let file = this.results[this.index] + this.openItem(file) + }, + openItem(file) { + // Show folder if (file.data.type === 'folder') { this.$router.push({name: 'Files', params: {id: this.results[this.index].data.id}})