diff options
| author | fenn-cs <fenn25.fn@gmail.com> | 2023-11-16 15:49:30 +0100 |
|---|---|---|
| committer | fenn-cs <fenn25.fn@gmail.com> | 2023-11-21 11:26:22 +0100 |
| commit | 8dadb09e54b67ee8726d39ba7ee201a30fb963d5 (patch) | |
| tree | e1eb544b28bcefeea949b519890dbd7499c877af /core | |
| parent | 4964cb838b88f43f312523b2c4ae558c487cc23c (diff) | |
| download | nextcloud-server-8dadb09e54b67ee8726d39ba7ee201a30fb963d5.tar.gz nextcloud-server-8dadb09e54b67ee8726d39ba7ee201a30fb963d5.zip | |
Round avatars when needed and show url-based mime icons
- Pass `results.rounded` property that comes with search result
data to determine if avatar would be rounded or not.
- Icons loaded via url's now visible.
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/views/GlobalSearchModal.vue | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/src/views/GlobalSearchModal.vue b/core/src/views/GlobalSearchModal.vue index 9db4c06c9bc..a9d422e0ff8 100644 --- a/core/src/views/GlobalSearchModal.vue +++ b/core/src/views/GlobalSearchModal.vue @@ -104,17 +104,17 @@ :bold="false" @click="openResult(result)"> <template #icon> - <div v-if="result.icon" - class="result-items__item-icon" + <div class="result-items__item-icon" :class="{ - 'result-items__item-icon--no-preview': !isValidUrl(result.thumbnailUrl), - 'result-items__item-icon--with-thumbnail': isValidUrl(result.thumbnailUrl), - [result.icon]: !isValidUrl(result.icon), + 'result-items__item-icon--rounded': result.rounded, + 'result-items__item-icon--no-preview': !isValidIconOrPreviewUrl(result.thumbnailUrl), + 'result-items__item-icon--with-thumbnail': isValidIconOrPreviewUrl(result.thumbnailUrl), + [result.icon]: !isValidIconOrPreviewUrl(result.icon), }" :style="{ - backgroundImage: isValidUrl(result.icon) ? `url(${result.icon})` : '', + backgroundImage: isValidIconOrPreviewUrl(result.icon) ? `url(${result.icon})` : '', }"> - <img v-if="result.thumbnailUrl" :src="result.thumbnailUrl" class=""> + <img v-if="isValidIconOrPreviewUrl(result.thumbnailUrl)" :src="result.thumbnailUrl" class=""> </div> </template> <template #subname> @@ -512,8 +512,8 @@ export default { this.dateFilter.text = t('core', `Between ${this.dateFilter.startFrom.toLocaleDateString()} and ${this.dateFilter.endAt.toLocaleDateString()}`) this.updateDateFilter() }, - isValidUrl(icon) { - return /^https?:\/\//.test(icon) || icon.startsWith('//') + isValidIconOrPreviewUrl(url) { + return /^https?:\/\//.test(url) || url.startsWith('/') }, closeModal() { this.searchQuery = '' |