e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Merge branch 'develop' of https://codeberg.org/thatonecalculator/calckey into develop

Browse source
This commit is contained in:
yawhn 2023-01-19 21:17:27 +02:00
parent 6c8a58fb5d f3f45bac5c
commit 349fad7f8a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/components/MkNotes.vue
View file

@ -1,5 +1,5 @@
<template>
<MkPagination ref="pagingComponent" :pagination="pagination">
<MkPagination ref="pagingComponent" :pagination="pagination" disableReload="true">
<template #empty>
<div class="_fullinfo">
<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>

3
packages/client/src/components/MkPagination.vue
View file

@ -69,6 +69,7 @@ const props = withDefaults(defineProps<{
disableAutoLoad?: boolean;
displayLimit?: number;
externalItemArray?: Ref<Array<any>>;
disableReload?: boolean;
}>(), {
displayLimit: 30,
});
@ -345,7 +346,7 @@ init();
onActivated(() => {
isBackTop.value = false;
if(alreadyInitedOnce.value) {
if(alreadyInitedOnce.value && (!props.disableReload || !props.disableReload.value)) {
reload();
}
});