Merge branch 'develop'

2019-04-18 22:01:45 +09:00
parent 929982117f debe648a98
commit 7b44727b23
39 changed files with 556 additions and 260 deletions
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@ -124,7 +124,7 @@ export default Vue.extend({
 		},

 		fetchMore() {
-			if (!this.more || this.moreFetching) return;
+			if (!this.more || this.moreFetching || this.notes.length === 0) return;
 			this.moreFetching = true;
 			this.makePromise(this.notes[this.notes.length - 1].id).then(x => {
 				this.notes = this.notes.concat(x.notes);