upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Round avatars when needed and show url-based mime icons

Browse source 
- 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>
This commit is contained in:
fenn-cs 2023-11-16 15:49:30 +01:00
parent 4964cb838b
commit 8dadb09e54
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/src/views/GlobalSearchModal.vue
View file

@ -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 = ''