mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-02 16:15:57 +09:00
Code

Merge pull request #7 from tamaina/pop

Browse Source 
Pop
This commit is contained in:
tamaina 2018-04-15 21:01:35 +09:00 committed by GitHub
commit 322742c3ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/app/desktop/views/components/timeline.vue
View File

@ -5,11 +5,11 @@
<mk-ellipsis-icon/> <mk-ellipsis-icon/>
</div> </div>
<p class="empty" v-if="notes.length == 0 && !fetching"> <p class="empty" v-if="notes.length == 0 && !fetching">
%fa:R comments%自分の投稿や、自分がフォローしているユーザーの投稿が表示されます。 %fa:R comments%%i18n:@empty%
</p> </p>
<mk-notes :notes="notes" ref="timeline"> <mk-notes :notes="notes" ref="timeline">
<button slot="footer" @click="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <button slot="footer" @click="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
<template v-if="!moreFetching">もっと見る</template> <template v-if="!moreFetching">%i18n:@load-more%</template>
<template v-if="moreFetching">%fa:spinner .pulse .fw%</template> <template v-if="moreFetching">%fa:spinner .pulse .fw%</template>
</button> </button>
</mk-notes> </mk-notes>
@ -29,7 +29,8 @@ export default Vue.extend({
notes: [], notes: [],
connection: null, connection: null,
connectionId: null, connectionId: null,
date: null date: null,
isTop: true
}; };
}, },
computed: { computed: {
@ -101,7 +102,7 @@ export default Vue.extend({
sound.play(); sound.play();
} }
this.notes.pop(); if (this.isTop) this.notes.pop();
this.notes.unshift(note); this.notes.unshift(note);
}, },
onChangeFollowing() { onChangeFollowing() {
@ -112,6 +113,8 @@ export default Vue.extend({
const current = window.scrollY + window.innerHeight; const current = window.scrollY + window.innerHeight;
if (current > document.body.offsetHeight - 8) this.more(); if (current > document.body.offsetHeight - 8) this.more();
} }
if (window.scrollY > 100) this.isTop = false;
else this.isTop = true;
}, },
onKeydown(e) { onKeydown(e) {
if (e.target.tagName != 'INPUT' && e.target.tagName != 'TEXTAREA') { if (e.target.tagName != 'INPUT' && e.target.tagName != 'TEXTAREA') {

14
src/client/app/mobile/views/components/timeline.vue
View File

@ -37,7 +37,8 @@ export default Vue.extend({
notes: [], notes: [],
existMore: false, existMore: false,
connection: null, connection: null,
connectionId: null connectionId: null,
isTop: true
}; };
}, },
computed: { computed: {
@ -53,6 +54,8 @@ export default Vue.extend({
this.connection.on('follow', this.onChangeFollowing); this.connection.on('follow', this.onChangeFollowing);
this.connection.on('unfollow', this.onChangeFollowing); this.connection.on('unfollow', this.onChangeFollowing);
window.addEventListener('scroll', this.onScroll);
this.fetch(); this.fetch();
}, },
beforeDestroy() { beforeDestroy() {
@ -95,10 +98,19 @@ export default Vue.extend({
}); });
}, },
onNote(note) { onNote(note) {
if (this.isTop) this.notes.pop();
this.notes.unshift(note); this.notes.unshift(note);
}, },
onChangeFollowing() { onChangeFollowing() {
this.fetch(); this.fetch();
},
onScroll() {
if ((this as any).os.i.clientSettings.fetchOnScroll !== false) {
const current = window.scrollY + window.innerHeight;
if (current > document.body.offsetHeight - 8) this.more();
}
if (window.scrollY > 100) this.isTop = false;
else this.isTop = true;
} }
} }
}); });