diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 09:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 09:09:01 +0000 |
commit | a53d2c37c4934f564caa94543dd4cf5af1703e2d (patch) | |
tree | a028dc39771a4612a9845ab700a73af2d6f3f51b /app/assets/javascripts/frequent_items | |
parent | 18b8435318887d3fc6e9f9d305967a953cdd7d3f (diff) | |
download | gitlab-ce-a53d2c37c4934f564caa94543dd4cf5af1703e2d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/frequent_items')
-rw-r--r-- | app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue b/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue index 3276d85f1cd..c0dadedbc51 100644 --- a/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue +++ b/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue @@ -1,6 +1,5 @@ <script> /* eslint-disable vue/require-default-prop */ -import { isEmpty, isString } from 'lodash'; import Identicon from '~/vue_shared/components/identicon.vue'; import highlight from '~/lib/utils/highlight'; import { truncateNamespace } from '~/lib/utils/text_utility'; @@ -38,9 +37,6 @@ export default { }, }, computed: { - hasAvatar() { - return isString(this.avatarUrl) && !isEmpty(this.avatarUrl); - }, truncatedNamespace() { return truncateNamespace(this.namespace); }, @@ -54,8 +50,11 @@ export default { <template> <li class="frequent-items-list-item-container"> <a :href="webUrl" class="clearfix"> - <div class="frequent-items-item-avatar-container avatar-container rect-avatar s32"> - <img v-if="hasAvatar" :src="avatarUrl" class="avatar s32" /> + <div + ref="frequentItemsItemAvatarContainer" + class="frequent-items-item-avatar-container avatar-container rect-avatar s32" + > + <img v-if="avatarUrl" ref="frequentItemsItemAvatar" :src="avatarUrl" class="avatar s32" /> <identicon v-else :entity-id="itemId" @@ -64,16 +63,18 @@ export default { class="rect-avatar" /> </div> - <div class="frequent-items-item-metadata-container"> + <div ref="frequentItemsItemMetadataContainer" class="frequent-items-item-metadata-container"> <div + ref="frequentItemsItemTitle" :title="itemName" - class="frequent-items-item-title js-frequent-items-item-title" + class="frequent-items-item-title" v-html="highlightedItemName" ></div> <div v-if="namespace" + ref="frequentItemsItemNamespace" :title="namespace" - class="frequent-items-item-namespace js-frequent-items-item-namespace" + class="frequent-items-item-namespace" > {{ truncatedNamespace }} </div> |