Resolve #3119
This commit is contained in:
		| @@ -110,11 +110,11 @@ export default Vue.extend({ | ||||
| 			this.init(); | ||||
| 		}, | ||||
|  | ||||
| 		init() { | ||||
| 		async init() { | ||||
| 			this.queue = []; | ||||
| 			this.notes = []; | ||||
| 			this.fetching = true; | ||||
| 			this.makePromise().then(x => { | ||||
| 			await (this.makePromise()).then(x => { | ||||
| 				if (Array.isArray(x)) { | ||||
| 					this.notes = x; | ||||
| 				} else { | ||||
| @@ -129,10 +129,10 @@ export default Vue.extend({ | ||||
| 			}); | ||||
| 		}, | ||||
|  | ||||
| 		fetchMore() { | ||||
| 		async fetchMore() { | ||||
| 			if (!this.more || this.moreFetching) return; | ||||
| 			this.moreFetching = true; | ||||
| 			this.makePromise(this.notes[this.notes.length - 1].id).then(x => { | ||||
| 			await (this.makePromise(this.notes[this.notes.length - 1].id)).then(x => { | ||||
| 				this.notes = this.notes.concat(x.notes); | ||||
| 				this.more = x.more; | ||||
| 				this.moreFetching = false; | ||||
|   | ||||
| @@ -14,6 +14,7 @@ | ||||
| import Vue from 'vue'; | ||||
| import XColumn from './deck.column.vue'; | ||||
| import XNotes from './deck.notes.vue'; | ||||
| import { genSearchQuery } from '../../../common/scripts/gen-search-query'; | ||||
|  | ||||
| const limit = 20; | ||||
|  | ||||
| @@ -25,10 +26,10 @@ export default Vue.extend({ | ||||
|  | ||||
| 	data() { | ||||
| 		return { | ||||
| 			makePromise: cursor => this.$root.api('notes/search', { | ||||
| 			makePromise: async cursor => this.$root.api('notes/search', { | ||||
| 				limit: limit + 1, | ||||
| 				offset: cursor ? cursor : undefined, | ||||
| 				query: this.q | ||||
| 				...(await genSearchQuery(this, this.q)) | ||||
| 			}).then(notes => { | ||||
| 				if (notes.length == limit + 1) { | ||||
| 					notes.pop(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 syuilo
					syuilo