From 0f33864df1497f43bcd931e6e2403191a90bb017 Mon Sep 17 00:00:00 2001
From: xianon <xianon@hotmail.co.jp>
Date: Thu, 19 May 2022 20:32:55 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=8E=E3=83=BC=E3=83=88=E8=A9=B3?=
=?UTF-8?q?=E7=B4=B0=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E6=96=B0=E3=81=97?=
=?UTF-8?q?=E3=81=84=E3=83=8E=E3=83=BC=E3=83=88=E3=82=92=E8=A1=A8=E7=A4=BA?=
=?UTF-8?q?=E3=81=99=E3=82=8B=E6=A9=9F=E8=83=BD=E3=81=AE=E5=8B=95=E4=BD=9C?=
=?UTF-8?q?=E3=81=8C=E6=AD=A3=E3=81=97=E3=81=8F=E3=81=AA=E3=82=8B=E3=82=88?=
=?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B=20(#8607?=
=?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* ノート詳細で新しいノートの表示が正しくないのを修正する
* ノート詳細から別のノート詳細を表示した時に前後の表示をリセットする
---
packages/client/src/components/ui/pagination.vue | 9 +++++++--
packages/client/src/pages/note.vue | 4 ++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/packages/client/src/components/ui/pagination.vue b/packages/client/src/components/ui/pagination.vue
index 9dd18785bc..428a9d0225 100644
--- a/packages/client/src/components/ui/pagination.vue
+++ b/packages/client/src/components/ui/pagination.vue
@@ -14,8 +14,14 @@
</div>
<div v-else ref="rootEl">
+ <div v-show="pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
+ <MkButton v-if="!moreFetching" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMoreAhead">
+ {{ $ts.loadMore }}
+ </MkButton>
+ <MkLoading v-else class="loading"/>
+ </div>
<slot :items="items"></slot>
- <div v-show="more" key="_more_" class="cxiknjgy _gap">
+ <div v-show="!pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
<MkButton v-if="!moreFetching" v-appear="($store.state.enableInfiniteScroll && !disableAutoLoad) ? fetchMore : null" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMore">
{{ $ts.loadMore }}
</MkButton>
@@ -278,7 +284,6 @@ defineExpose({
queue,
backed,
reload,
- fetchMoreAhead,
prepend,
append,
removeItem,
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 29261ec484..9e174ef495 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -108,6 +108,10 @@ export default defineComponent({
},
methods: {
fetch() {
+ this.hasPrev = false;
+ this.hasNext = false;
+ this.showPrev = false;
+ this.showNext = false;
this.note = null;
os.api('notes/show', {
noteId: this.noteId