diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-07-11 10:13:11 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 10:13:11 +0900 |
| commit | cf3fc97202588e835ade5d6ab1a3c087e46958ad (patch) | |
| tree | b3fe472b455bf913a47df4d41b1363c7122bf1d9 /src/client/scripts | |
| parent | タイムライン上でTwitterウィジットを展開できるようにな... (diff) | |
| download | sharkey-cf3fc97202588e835ade5d6ab1a3c087e46958ad.tar.gz sharkey-cf3fc97202588e835ade5d6ab1a3c087e46958ad.tar.bz2 sharkey-cf3fc97202588e835ade5d6ab1a3c087e46958ad.zip | |
Deck (#6504)
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
Diffstat (limited to 'src/client/scripts')
| -rw-r--r-- | src/client/scripts/form.ts | 26 | ||||
| -rw-r--r-- | src/client/scripts/paging.ts | 2 | ||||
| -rw-r--r-- | src/client/scripts/scroll.ts | 4 |
3 files changed, 29 insertions, 3 deletions
diff --git a/src/client/scripts/form.ts b/src/client/scripts/form.ts new file mode 100644 index 0000000000..3cf062be2a --- /dev/null +++ b/src/client/scripts/form.ts @@ -0,0 +1,26 @@ +export type FormItem = { + label?: string; + type: 'string'; + default: string | null; + hidden?: boolean; + multiline?: boolean; +} | { + label?: string; + type: 'number'; + default: number | null; + hidden?: boolean; + step?: number; +} | { + label?: string; + type: 'boolean'; + default: boolean | null; + hidden?: boolean; +} | { + label?: string; + type: 'enum'; + default: string | null; + hidden?: boolean; + enum: string[]; +}; + +export type Form = Record<string, FormItem>; diff --git a/src/client/scripts/paging.ts b/src/client/scripts/paging.ts index 1f302753e1..8efff7aa41 100644 --- a/src/client/scripts/paging.ts +++ b/src/client/scripts/paging.ts @@ -13,7 +13,7 @@ export default (opts) => ({ moreFetching: false, inited: false, more: false, - backed: false, + backed: false, // 遡り中か否か isBackTop: false, ilObserver: new IntersectionObserver( (entries) => entries.some((entry) => entry.isIntersecting) diff --git a/src/client/scripts/scroll.ts b/src/client/scripts/scroll.ts index 76881bbde1..f32e50cdc7 100644 --- a/src/client/scripts/scroll.ts +++ b/src/client/scripts/scroll.ts @@ -1,7 +1,7 @@ export function getScrollContainer(el: Element | null): Element | null { if (el == null || el.tagName === 'BODY') return null; - const style = window.getComputedStyle(el); - if (style.getPropertyValue('overflow') === 'auto') { + const overflow = window.getComputedStyle(el).getPropertyValue('overflow'); + if (overflow.endsWith('auto')) { // xとyを個別に指定している場合、hidden auto みたいな値になる return el; } else { return getScrollContainer(el.parentElement); |