diff options
| author | xianon <xianon@hotmail.co.jp> | 2022-05-19 20:32:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-19 20:32:55 +0900 |
| commit | 0f33864df1497f43bcd931e6e2403191a90bb017 (patch) | |
| tree | 089dd9b70597428ca88b48852b0e52caeebfee45 | |
| parent | refactor(client): refactor admin/settings to use Composition API (#8678) (diff) | |
| download | misskey-0f33864df1497f43bcd931e6e2403191a90bb017.tar.gz misskey-0f33864df1497f43bcd931e6e2403191a90bb017.tar.bz2 misskey-0f33864df1497f43bcd931e6e2403191a90bb017.zip | |
fix: ノート詳細ページの新しいノートを表示する機能の動作が正しくなるように修正する (#8607)
* ノート詳細で新しいノートの表示が正しくないのを修正する
* ノート詳細から別のノート詳細を表示した時に前後の表示をリセットする
| -rw-r--r-- | packages/client/src/components/ui/pagination.vue | 9 | ||||
| -rw-r--r-- | 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 |