aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaehoon <th.dev91@gmail.com>2019-04-02 16:02:02 -0400
committertaehoon <th.dev91@gmail.com>2019-04-14 23:44:49 -0400
commit1cf9780e05957c96b6d6b6b898b83ff1987b2703 (patch)
tree0c2a7cf3aede44233f12f919cd60e53636cb9e14
parentfc5f4fba8c4af713855b881d7b178623b1e77b01 (diff)
make more generic
-rw-r--r--src/components/user_autosuggest/user_autosuggest.js5
-rw-r--r--src/components/user_autosuggest/user_autosuggest.vue3
-rw-r--r--src/components/user_settings/user_settings.js3
-rw-r--r--src/components/user_settings/user_settings.vue4
4 files changed, 7 insertions, 8 deletions
diff --git a/src/components/user_autosuggest/user_autosuggest.js b/src/components/user_autosuggest/user_autosuggest.js
index 12a6964a..d4efe912 100644
--- a/src/components/user_autosuggest/user_autosuggest.js
+++ b/src/components/user_autosuggest/user_autosuggest.js
@@ -1,5 +1,3 @@
-import BlockCard from '../block_card/block_card.vue'
-
const debounceMilliseconds = 500
export default {
@@ -16,9 +14,6 @@ export default {
default: 'Search...'
}
},
- components: {
- BlockCard
- },
data () {
return {
term: '',
diff --git a/src/components/user_autosuggest/user_autosuggest.vue b/src/components/user_autosuggest/user_autosuggest.vue
index db3e1bdf..6eaecbaa 100644
--- a/src/components/user_autosuggest/user_autosuggest.vue
+++ b/src/components/user_autosuggest/user_autosuggest.vue
@@ -2,7 +2,8 @@
<div class="user-autosuggest" v-click-outside="onClickOutside">
<input v-model="term" :placeholder="placeholder" @click="onInputClick" class="user-autosuggest-input" />
<div class="user-autosuggest-results" v-if="resultsVisible && filtered.length > 0">
- <BlockCard v-for="userId in filtered" :key="userId" :userId="userId"/>
+ <slot v-for="item in filtered" :item="item">
+ </slot>
</div>
</div>
</template>
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index 259e3418..2cae2d00 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -78,7 +78,8 @@ const UserSettings = {
BlockList,
MuteList,
EmojiInput,
- UserAutoSuggest
+ UserAutoSuggest,
+ BlockCard
},
computed: {
user () {
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 3dde5ae1..69d3dc53 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -196,7 +196,9 @@
<div :label="$t('settings.blocks_tab')">
<div class="profile-edit-usersearch-wrapper">
- <UserAutoSuggest :filter="filterUnblockedUsers" :query="queryUserIds" placeholder="Search whom you want to block" />
+ <UserAutoSuggest :filter="filterUnblockedUsers" :query="queryUserIds" placeholder="Search whom you want to block">
+ <BlockCard slot-scope="row" :userId="row.item"/>
+ </UserAutoSuggest>
</div>
<block-list :refresh="true">
<template slot="empty">{{$t('settings.no_blocks')}}</template>