summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-05-25 21:05:16 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-05-25 21:05:16 +0900
commit712c0ef27d72e522f8628c349b5ccf950cfeaed6 (patch)
tree01a1b87a980ef51aedf30be27dae8eed17d4523e /src/client
parentoops (diff)
downloadmisskey-712c0ef27d72e522f8628c349b5ccf950cfeaed6.tar.gz
misskey-712c0ef27d72e522f8628c349b5ccf950cfeaed6.tar.bz2
misskey-712c0ef27d72e522f8628c349b5ccf950cfeaed6.zip
Refactor: Use better english
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/desktop/views/components/note-detail.vue34
-rw-r--r--src/client/app/mobile/views/components/note-detail.vue32
2 files changed, 33 insertions, 33 deletions
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index d5526e5d6a..5b48b7a1ba 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -2,16 +2,16 @@
<div class="mk-note-detail" :title="title">
<button
class="read-more"
- v-if="p.reply && p.reply.replyId && context.length == 0"
+ v-if="p.reply && p.reply.replyId && conversation.length == 0"
title="%i18n:@more%"
- @click="fetchContext"
- :disabled="contextFetching"
+ @click="fetchConversation"
+ :disabled="conversationFetching"
>
- <template v-if="!contextFetching">%fa:ellipsis-v%</template>
- <template v-if="contextFetching">%fa:spinner .pulse%</template>
+ <template v-if="!conversationFetching">%fa:ellipsis-v%</template>
+ <template v-if="conversationFetching">%fa:spinner .pulse%</template>
</button>
- <div class="context">
- <x-sub v-for="note in context" :key="note.id" :note="note"/>
+ <div class="conversation">
+ <x-sub v-for="note in conversation" :key="note.id" :note="note"/>
</div>
<div class="reply-to" v-if="p.reply">
<x-sub :note="p.reply"/>
@@ -107,8 +107,8 @@ export default Vue.extend({
data() {
return {
- context: [],
- contextFetching: false,
+ conversation: [],
+ conversationFetching: false,
replies: []
};
},
@@ -176,15 +176,15 @@ export default Vue.extend({
},
methods: {
- fetchContext() {
- this.contextFetching = true;
+ fetchConversation() {
+ this.conversationFetching = true;
- // Fetch context
- (this as any).api('notes/context', {
+ // Fetch conversation
+ (this as any).api('notes/conversation', {
noteId: this.p.replyId
- }).then(context => {
- this.contextFetching = false;
- this.context = context.reverse();
+ }).then(conversation => {
+ this.conversationFetching = false;
+ this.conversation = conversation.reverse();
});
},
reply() {
@@ -249,7 +249,7 @@ root(isDark)
&:disabled
color isDark ? #21242b : #ccc
- > .context
+ > .conversation
> *
border-bottom 1px solid isDark ? #1c2023 : #eef0f2
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index c6664a91da..244dbb6c03 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -2,15 +2,15 @@
<div class="mk-note-detail">
<button
class="more"
- v-if="p.reply && p.reply.replyId && context.length == 0"
- @click="fetchContext"
- :disabled="fetchingContext"
+ v-if="p.reply && p.reply.replyId && conversation.length == 0"
+ @click="fetchConversation"
+ :disabled="conversationFetching"
>
- <template v-if="!contextFetching">%fa:ellipsis-v%</template>
- <template v-if="contextFetching">%fa:spinner .pulse%</template>
+ <template v-if="!conversationFetching">%fa:ellipsis-v%</template>
+ <template v-if="conversationFetching">%fa:spinner .pulse%</template>
</button>
- <div class="context">
- <x-sub v-for="note in context" :key="note.id" :note="note"/>
+ <div class="conversation">
+ <x-sub v-for="note in conversation" :key="note.id" :note="note"/>
</div>
<div class="reply-to" v-if="p.reply">
<x-sub :note="p.reply"/>
@@ -99,8 +99,8 @@ export default Vue.extend({
data() {
return {
- context: [],
- contextFetching: false,
+ conversation: [],
+ conversationFetching: false,
replies: []
};
},
@@ -166,14 +166,14 @@ export default Vue.extend({
methods: {
fetchContext() {
- this.contextFetching = true;
+ this.conversationFetching = true;
- // Fetch context
- (this as any).api('notes/context', {
+ // Fetch conversation
+ (this as any).api('notes/conversation', {
noteId: this.p.replyId
- }).then(context => {
- this.contextFetching = false;
- this.context = context.reverse();
+ }).then(conversation => {
+ this.conversationFetching = false;
+ this.conversation = conversation.reverse();
});
},
reply() {
@@ -245,7 +245,7 @@ root(isDark)
&:disabled
color #ccc
- > .context
+ > .conversation
> *
border-bottom 1px solid isDark ? #1c2023 : #eef0f2