aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
authorBrenden Bice <brenden.next@gmail.com>2019-04-02 12:13:55 -0400
committerBrenden Bice <brenden.next@gmail.com>2019-04-11 23:26:12 -0400
commit8c9bcdc6c16f3a6dad5131b8163ee9d933b6b952 (patch)
tree9a8d044ae24769f2590bd6b8f6864366338b75d4 /src/components
parent6511166631aa752faff02568802362155918e804 (diff)
rename favourite to favorite
Diffstat (limited to 'src/components')
-rw-r--r--src/components/conversation/conversation.js6
-rw-r--r--src/components/status/status.vue4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 851d30e9..ba90746e 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -121,7 +121,7 @@ const conversation = {
this.$store.state.api.backendInteractor.fetchConversation({id: this.status.id})
.then(({ancestors, descendants}) => {
const ancestorId = ancestors.length ? ancestors[0].id : this.status.id
- this.fetchFavouritedByUsers(ancestorId)
+ this.fetchFavoritedByUsers(ancestorId)
this.fetchRebloggedByUsers(ancestorId)
this.$store.dispatch('addNewStatuses', { statuses: ancestors })
this.$store.dispatch('addNewStatuses', { statuses: descendants })
@@ -152,8 +152,8 @@ const conversation = {
this.setHighlight(null)
}
},
- fetchFavouritedByUsers (id) {
- this.$store.dispatch('fetchFavouritedByUsers', { id })
+ fetchFavoritedByUsers (id) {
+ this.$store.dispatch('fetchFavoritedByUsers', { id })
},
fetchRebloggedByUsers (id) {
this.$store.dispatch('fetchRebloggedByUsers', { id })
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ce4b2554..a8042afe 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -133,7 +133,7 @@
<link-preview :card="status.card" :size="attachmentSize" :nsfw="nsfwClickthrough" />
</div>
- <div class="favs-favourited-users" v-if="combinedFavsAndRepeatsAvatars.length > 0" :class="{ 'status-fadein': combinedFavsAndRepeatsAvatars.length > 0 }">
+ <div class="favs-favorited-users" v-if="combinedFavsAndRepeatsAvatars.length > 0" :class="{ 'status-fadein': combinedFavsAndRepeatsAvatars.length > 0 }">
<AvatarList :avatars='combinedFavsAndRepeatsAvatars'></AvatarList>
</div>
@@ -616,7 +616,7 @@ a.unmute {
}
}
-.favs-favourited-users {
+.favs-favorited-users {
margin-top: 10px;
}