This commit is contained in:
syuilo
2019-04-25 07:46:39 +09:00
parent 772258b0b8
commit 0db54386cd
14 changed files with 147 additions and 90 deletions

View File

@@ -60,9 +60,9 @@ export default Vue.extend({
},
methods: {
init() {
async init() {
this.fetching = true;
this.makePromise().then(x => {
await (this.makePromise()).then(x => {
if (Array.isArray(x)) {
this.us = x;
} else {
@@ -76,9 +76,9 @@ export default Vue.extend({
});
},
fetchMoreUsers() {
async fetchMoreUsers() {
this.fetchingMoreUsers = true;
this.makePromise(this.cursor).then(x => {
await (this.makePromise(this.cursor)).then(x => {
this.us = this.us.concat(x.users);
this.cursor = x.cursor;
this.fetchingMoreUsers = false;

View File

@@ -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;

View File

@@ -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();