Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feat-1714

Browse source
This commit is contained in:
かっこかり 2024-07-15 10:11:15 +09:00 • committed by GitHub
commit 8d144c8fdc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
85 changed files with 1222 additions and 831 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
View file

@ -65,7 +65,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
const validTime = (t: string | boolean | null | undefined) => {
if (t == null) return null;
if (typeof t === 'boolean') return null;
return t.match(/^[0-9.]+s$/) ? t : null;
return t.match(/^\-?[0-9.]+s$/) ? t : null;
};
const validColor = (c: unknown): string | null => {

2
packages/frontend/src/components/global/RouterView.vue
View file

@ -60,7 +60,7 @@ function onChange({ resolved, key: newKey }) {
if (current == null || 'redirect' in current.route) return;
currentPageComponent.value = current.route.component;
currentPageProps.value = current.props;
key.value = current.route.path + JSON.stringify(Object.fromEntries(current.props));
key.value = newKey + JSON.stringify(Object.fromEntries(current.props));
nextTick(() => {
// ページ遷移完了後に再びキャッシュを有効化