Merge branch 'misskey-develop' into merge/2025-03-24

2025-03-30 01:58:17 -04:00
parent b4e3062083 303b62aff3
commit 4ae26e6e18
113 changed files with 1303 additions and 1720 deletions
@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { computed, watch, ref, useTemplateRef } from 'vue';
 import * as Misskey from 'misskey-js';
-import { scroll } from '@@/js/scroll.js';
+import { scrollInContainer } from '@@/js/scroll.js';
 import MkTimeline from '@/components/MkTimeline.vue';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { definePage } from '@/page.js';
@@ -77,7 +77,7 @@ function queueUpdated(q) {
 }

 function top() {
-	scroll(rootEl.value, { top: 0 });
+	scrollInContainer(rootEl.value, { top: 0 });
 }

 function settings() {