Madeorsk/rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: alt texts shouldn't be interpreted as MFM

Browse Source
This commit is contained in:
naskya 2023-09-27 16:46:43 +09:00
parent b4cdc463a0
commit 04369c9da9
No known key found for this signature in database
GPG Key ID: 164DFF24E2D40139
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/client/src/components/MkDialog.vue
View File

@ -54,7 +54,8 @@
<Mfm :text="i18n.ts.password" /> <Mfm :text="i18n.ts.password" />
</header> </header>
<div v-if="text" :class="$style.text"> <div v-if="text" :class="$style.text">
<Mfm :text="text" /> <span v-if="isPlaintext === true">{{ text }}</span>
<Mfm v-else :text="text" />
</div> </div>
<MkInput <MkInput
v-if="input && input.type !== 'paragraph'" v-if="input && input.type !== 'paragraph'"
@ -245,6 +246,7 @@ const props = withDefaults(
| "search"; | "search";
title: string; title: string;
text?: string; text?: string;
isPlaintext?: boolean;
input?: Input; input?: Input;
select?: Select; select?: Select;
icon?: string; icon?: string;
@ -268,6 +270,7 @@ const props = withDefaults(
isYesNo: false, isYesNo: false,
cancelableByBgClick: true, cancelableByBgClick: true,
isPlaintext: false,
}, },
); );

1
packages/client/src/components/MkMedia.vue
View File

@ -138,6 +138,7 @@ function captionPopup() {
os.alert({ os.alert({
type: "info", type: "info",
text: props.media.comment, text: props.media.comment,
isPlaintext: true,
}); });
} }

3
packages/client/src/os.ts
View File

@ -277,6 +277,7 @@ export function alert(props: {
type?: "error" | "info" | "success" | "warning" | "waiting" | "question"; type?: "error" | "info" | "success" | "warning" | "waiting" | "question";
title?: string | null; title?: string | null;
text?: string | null; text?: string | null;
isPlaintext?: boolean;
}): Promise<void> { }): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (props.text == null && props.type === "error") { if (props.text == null && props.type === "error") {
@ -301,6 +302,7 @@ export function confirm(props: {
text?: string | null; text?: string | null;
okText?: string; okText?: string;
cancelText?: string; cancelText?: string;
isPlaintext?: boolean;
}): Promise<{ canceled: boolean }> { }): Promise<{ canceled: boolean }> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
popup( popup(
@ -323,6 +325,7 @@ export function yesno(props: {
type: "error" | "info" | "success" | "warning" | "waiting" | "question"; type: "error" | "info" | "success" | "warning" | "waiting" | "question";
title?: string | null; title?: string | null;
text?: string | null; text?: string | null;
isPlaintext?: boolean;
}): Promise<{ canceled: boolean }> { }): Promise<{ canceled: boolean }> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
popup( popup(