graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 02:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improve paging

Browse source
This commit is contained in:
syuilo 2020-02-18 18:19:11 +09:00
parent 52fb1237ec
commit 3d79e7a136
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/scripts/paging.ts
View file

@ -67,7 +67,7 @@ export default (opts) => ({
...params,
limit: this.pagination.noPaging ? (this.pagination.limit || 10) : (this.pagination.limit || 10) + 1,
}).then(items => {
if (!this.pagination.noPaging && (items.length === (this.pagination.limit || 10) + 1)) {
if (!this.pagination.noPaging && (items.length > (this.pagination.limit || 10))) {
items.pop();
this.items = this.pagination.reversed ? [...items].reverse() : items;
this.more = true;
@ -103,7 +103,7 @@ export default (opts) => ({
untilId: this.items[this.items.length - 1].id,
}),
}).then(items => {
if (items.length === SECOND_FETCH_LIMIT + 1) {
if (items.length > SECOND_FETCH_LIMIT) {
items.pop();
this.items = this.pagination.reversed ? [...items].reverse().concat(this.items) : this.items.concat(items);
this.more = true;

1
src/server/api/common/inject-promo.ts
View file

@ -32,5 +32,4 @@ export async function injectPromo(user: User, timeline: Note[]) {
// Inject promo
timeline.splice(3, 0, note);
timeline.pop();
}