aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaehoon <th.dev91@gmail.com>2019-04-04 00:00:21 -0400
committertaehoon <th.dev91@gmail.com>2019-04-17 11:32:49 -0400
commit32035217b8e04b0f178409f0f1f49d54296ce80c (patch)
tree0d9f3ad7d51d8ab060e9457cac9e16108d57a20c
parent792ae1697e1a3710a6f12eb70a3c81b0318f9515 (diff)
clean up
-rw-r--r--src/components/list/list.vue2
-rw-r--r--src/components/selectable_list/selectable_list.js11
-rw-r--r--src/components/user_profile/user_profile.vue4
-rw-r--r--src/components/user_settings/user_settings.vue8
4 files changed, 8 insertions, 17 deletions
diff --git a/src/components/list/list.vue b/src/components/list/list.vue
index 1159898d..7d62283a 100644
--- a/src/components/list/list.vue
+++ b/src/components/list/list.vue
@@ -18,7 +18,7 @@ export default {
},
getKey: {
type: Function,
- default: item => item
+ default: item => item.id
}
}
}
diff --git a/src/components/selectable_list/selectable_list.js b/src/components/selectable_list/selectable_list.js
index 1fdd5a67..7856d725 100644
--- a/src/components/selectable_list/selectable_list.js
+++ b/src/components/selectable_list/selectable_list.js
@@ -6,16 +6,7 @@ const SelectableList = {
List,
Checkbox
},
- props: {
- items: {
- type: Array,
- default: () => []
- },
- getKey: {
- type: Function,
- default: item => item
- }
- },
+ props: List.props,
data () {
return {
selected: []
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 39f3c381..8d78d2d2 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -16,14 +16,14 @@
<div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count">
<FriendList :userId="userId">
<template slot="item" scope="p">
- <FollowCard :key="p.item.id" :user="p.item" />
+ <FollowCard :user="p.item" />
</template>
</FriendList>
</div>
<div :label="$t('user_card.followers')" v-if="followersTabVisible" :disabled="!user.followers_count">
<FollowerList :userId="userId">
<template slot="item" scope="p">
- <FollowCard :key="p.item.id" :user="p.item" :noFollowsYou="isUs" />
+ <FollowCard :user="p.item" :noFollowsYou="isUs" />
</template>
</FollowerList>
</div>
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 741fbe3f..66ce6cea 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -200,9 +200,9 @@
<BlockCard slot-scope="row" :userId="row.item"/>
</Autosuggest>
</div>
- <BlockList :refresh="true">
+ <BlockList :refresh="true" :getKey="item => item">
<template slot="item" scope="p">
- <BlockCard :key="p.item" :userId="p.item" />
+ <BlockCard :userId="p.item" />
</template>
<template slot="empty">{{$t('settings.no_blocks')}}</template>
</BlockList>
@@ -214,9 +214,9 @@
<MuteCard slot-scope="row" :userId="row.item"/>
</Autosuggest>
</div>
- <MuteList :refresh="true">
+ <MuteList :refresh="true" :getKey="item => item">
<template slot="item" scope="p">
- <MuteCard :key="p.item" :userId="p.item" />
+ <MuteCard :userId="p.item" />
</template>
<template slot="empty">{{$t('settings.no_mutes')}}</template>
</MuteList>