usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from tamaina/pop 

Pop
This commit is contained in:
tamaina 2018-04-15 23:51:23 +09:00 committed by GitHub
parent 32e40df53c 9a152162e5
commit 8f518eba09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,8 +113,7 @@ 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; this.isTop = window.scrollY < 100;
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') {

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

@ -98,8 +98,7 @@ export default Vue.extend({
}); });
}, },
onNote(note) { onNote(note) {
if (this.isTop) this.notes.pop(); this.isTop = window.scrollY < 100;
this.notes.unshift(note);
}, },
onChangeFollowing() { onChangeFollowing() {
this.fetch(); this.fetch();