diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-08 02:30:37 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-08 02:30:37 +0900 |
| commit | a1b490afa756a71b9cef4afa424575bc223bc612 (patch) | |
| tree | 06de4d839e17b1e08e0891542af7360c701a154a /src/client/app/desktop/views/components/timeline.vue | |
| parent | Merge pull request #1392 from syuilo/greenkeeper/element-ui-2.3.3 (diff) | |
| download | misskey-a1b490afa756a71b9cef4afa424575bc223bc612.tar.gz misskey-a1b490afa756a71b9cef4afa424575bc223bc612.tar.bz2 misskey-a1b490afa756a71b9cef4afa424575bc223bc612.zip | |
Post --> Note
Closes #1411
Diffstat (limited to 'src/client/app/desktop/views/components/timeline.vue')
| -rw-r--r-- | src/client/app/desktop/views/components/timeline.vue | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/client/app/desktop/views/components/timeline.vue b/src/client/app/desktop/views/components/timeline.vue index 65b4bd1c7a..6d049eee9c 100644 --- a/src/client/app/desktop/views/components/timeline.vue +++ b/src/client/app/desktop/views/components/timeline.vue @@ -4,15 +4,15 @@ <div class="fetching" v-if="fetching"> <mk-ellipsis-icon/> </div> - <p class="empty" v-if="posts.length == 0 && !fetching"> + <p class="empty" v-if="notes.length == 0 && !fetching"> %fa:R comments%自分の投稿や、自分がフォローしているユーザーの投稿が表示されます。 </p> - <mk-posts :posts="posts" ref="timeline"> + <mk-notes :notes="notes" ref="timeline"> <button slot="footer" @click="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <template v-if="!moreFetching">もっと見る</template> <template v-if="moreFetching">%fa:spinner .pulse .fw%</template> </button> - </mk-posts> + </mk-notes> </div> </template> @@ -26,7 +26,7 @@ export default Vue.extend({ fetching: true, moreFetching: false, existMore: false, - posts: [], + notes: [], connection: null, connectionId: null, date: null @@ -41,7 +41,7 @@ export default Vue.extend({ this.connection = (this as any).os.stream.getConnection(); this.connectionId = (this as any).os.stream.use(); - this.connection.on('post', this.onPost); + this.connection.on('note', this.onNote); this.connection.on('follow', this.onChangeFollowing); this.connection.on('unfollow', this.onChangeFollowing); @@ -51,7 +51,7 @@ export default Vue.extend({ this.fetch(); }, beforeDestroy() { - this.connection.off('post', this.onPost); + this.connection.off('note', this.onNote); this.connection.off('follow', this.onChangeFollowing); this.connection.off('unfollow', this.onChangeFollowing); (this as any).os.stream.dispose(this.connectionId); @@ -63,45 +63,45 @@ export default Vue.extend({ fetch(cb?) { this.fetching = true; - (this as any).api('posts/timeline', { + (this as any).api('notes/timeline', { limit: 11, untilDate: this.date ? this.date.getTime() : undefined - }).then(posts => { - if (posts.length == 11) { - posts.pop(); + }).then(notes => { + if (notes.length == 11) { + notes.pop(); this.existMore = true; } - this.posts = posts; + this.notes = notes; this.fetching = false; this.$emit('loaded'); if (cb) cb(); }); }, more() { - if (this.moreFetching || this.fetching || this.posts.length == 0 || !this.existMore) return; + if (this.moreFetching || this.fetching || this.notes.length == 0 || !this.existMore) return; this.moreFetching = true; - (this as any).api('posts/timeline', { + (this as any).api('notes/timeline', { limit: 11, - untilId: this.posts[this.posts.length - 1].id - }).then(posts => { - if (posts.length == 11) { - posts.pop(); + untilId: this.notes[this.notes.length - 1].id + }).then(notes => { + if (notes.length == 11) { + notes.pop(); } else { this.existMore = false; } - this.posts = this.posts.concat(posts); + this.notes = this.notes.concat(notes); this.moreFetching = false; }); }, - onPost(post) { + onNote(note) { // サウンドを再生する if ((this as any).os.isEnableSounds) { - const sound = new Audio(`${url}/assets/post.mp3`); + const sound = new Audio(`${url}/assets/note.mp3`); sound.volume = localStorage.getItem('soundVolume') ? parseInt(localStorage.getItem('soundVolume'), 10) / 100 : 1; sound.play(); } - this.posts.unshift(post); + this.notes.unshift(note); }, onChangeFollowing() { this.fetch(); |