natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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> <template>
<MkPagination ref="pagingComponent" :pagination="pagination"> <MkPagination ref="pagingComponent" :pagination="pagination" disableReload="true">
<template #empty> <template #empty>
<div class="_fullinfo"> <div class="_fullinfo">
<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/> <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; disableAutoLoad?: boolean;
displayLimit?: number; displayLimit?: number;
externalItemArray?: Ref<Array<any>>; externalItemArray?: Ref<Array<any>>;
disableReload?: boolean;
}>(), { }>(), {
displayLimit: 30, displayLimit: 30,
}); });
@ -345,7 +346,7 @@ init();
onActivated(() => { onActivated(() => {
isBackTop.value = false; isBackTop.value = false;
if(alreadyInitedOnce.value) { if(alreadyInitedOnce.value && (!props.disableReload || !props.disableReload.value)) {
reload(); reload();
} }
}); });