summaryrefslogtreecommitdiff
path: root/packages/frontend-shared/js
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-03-30 01:58:17 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-03-30 01:58:17 -0400
commit4ae26e6e185e52ac186ac10ccd4eda7718bf6e26 (patch)
tree8d556072f3876f0bfbab9d24e7cd209ca6bd091a /packages/frontend-shared/js
parentrestore following feed deck UI (diff)
parentNew Crowdin updates (#15721) (diff)
downloadsharkey-4ae26e6e185e52ac186ac10ccd4eda7718bf6e26.tar.gz
sharkey-4ae26e6e185e52ac186ac10ccd4eda7718bf6e26.tar.bz2
sharkey-4ae26e6e185e52ac186ac10ccd4eda7718bf6e26.zip
Merge branch 'misskey-develop' into merge/2025-03-24
Diffstat (limited to 'packages/frontend-shared/js')
-rw-r--r--packages/frontend-shared/js/scroll.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend-shared/js/scroll.ts b/packages/frontend-shared/js/scroll.ts
index 6c61c582e1..9057b896c6 100644
--- a/packages/frontend-shared/js/scroll.ts
+++ b/packages/frontend-shared/js/scroll.ts
@@ -93,7 +93,7 @@ export function onScrollBottom(el: HTMLElement, cb: () => unknown, tolerance = 1
return removeListener;
}
-export function scroll(el: HTMLElement, options: ScrollToOptions | undefined) {
+export function scrollInContainer(el: HTMLElement, options: ScrollToOptions | undefined) {
const container = getScrollContainer(el);
if (container == null) {
window.scroll(options);
@@ -108,7 +108,7 @@ export function scroll(el: HTMLElement, options: ScrollToOptions | undefined) {
* @param options Scroll options
*/
export function scrollToTop(el: HTMLElement, options: { behavior?: ScrollBehavior; } = {}) {
- scroll(el, { top: 0, ...options });
+ scrollInContainer(el, { top: 0, ...options });
}
/**