sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
syuilo
2019-04-25 07:48:29 +09:00
parent afe2037985 fe87d16d46
commit 7495206db2
19 changed files with 262 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/app/common/views/deck/deck.notes.vue
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;