From a72ef7077003d6791b14e9368b96075183858485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?hibiya=20=28=EA=B9=80=EC=A2=85=EC=9D=B4=29?=
<inemuri@hibiya.moe>
Date: Thu, 13 Jul 2023 19:51:16 +0900
Subject: [PATCH 1/2] fix(frontend): allow non-center container align (#11255)
Closes #11251
---
packages/frontend/src/components/MkAsUi.vue | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/packages/frontend/src/components/MkAsUi.vue b/packages/frontend/src/components/MkAsUi.vue
index 8bfcfa6aa6..7aa8f94c3b 100644
--- a/packages/frontend/src/components/MkAsUi.vue
+++ b/packages/frontend/src/components/MkAsUi.vue
@@ -39,7 +39,7 @@
<MkAsUi v-if="!g(child).hidden" :component="g(child)" :components="props.components" :size="size"/>
</template>
</MkFolder>
- <div v-else-if="c.type === 'container'" :class="[$style.container, { [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace', [$style.containerCenter]: c.align === 'center' }]" :style="{ backgroundColor: c.bgColor ?? null, color: c.fgColor ?? null, borderWidth: c.borderWidth ? `${c.borderWidth}px` : 0, borderColor: c.borderColor ?? 'var(--divider)', padding: c.padding ? `${c.padding}px` : 0, borderRadius: c.rounded ? '8px' : 0 }">
+ <div v-else-if="c.type === 'container'" :class="[$style.container, { [$style.fontSerif]: c.font === 'serif', [$style.fontMonospace]: c.font === 'monospace' }]" :style="{ textAlign: c.align ?? null, backgroundColor: c.bgColor ?? null, color: c.fgColor ?? null, borderWidth: c.borderWidth ? `${c.borderWidth}px` : 0, borderColor: c.borderColor ?? 'var(--divider)', padding: c.padding ? `${c.padding}px` : 0, borderRadius: c.rounded ? '8px' : 0 }">
<template v-for="child in c.children" :key="child">
<MkAsUi v-if="!g(child).hidden" :component="g(child)" :components="props.components" :size="size" :align="c.align"/>
</template>
@@ -102,10 +102,6 @@ function openPostForm() {
gap: 12px;
}
-.containerCenter {
- text-align: center;
-}
-
.fontSerif {
font-family: serif;
}
From c13fd420154ed5445efad1e19f37a9fab354a870 Mon Sep 17 00:00:00 2001
From: setaria <ahu430@hotmail.com>
Date: Thu, 13 Jul 2023 19:52:18 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E9=96=B2=E8=A6=A7?=
=?UTF-8?q?=E4=B8=AD=E3=81=AEURL=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99?=
=?UTF-8?q?=E3=82=8B=E3=83=97=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3=E3=82=92?=
=?UTF-8?q?=E8=BF=BD=E5=8A=A0=20(#11234)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* 現在閲覧中のURLを取得するプロパティを追加 #11232
* commit the uncommitted remainder
---------
Co-authored-by: setaria <v.setaria@gmail.com>
---
CHANGELOG.md | 1 +
packages/frontend/src/scripts/aiscript/api.ts | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d6dd3a7db..3ef7eab90a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
- フォルダーやファイルに対しても開発者モード使用時、IDをコピーできるように
- 引用対象を「もっと見る」で展開した場合、「閉じる」で畳めるように
- プロフィールURLをコピーできるボタンを追加 #11190
+- `CURRENT_URL`で現在表示中のURLを取得できるように(AiScript)
- ユーザーのContextMenuに「アンテナに追加」ボタンを追加
- フォローやお気に入り登録をしていないチャンネルを開く時は概要ページを開くように
- 画面ビューワをタップした場合、マウスクリックと同様に画像ビューワを閉じるように
diff --git a/packages/frontend/src/scripts/aiscript/api.ts b/packages/frontend/src/scripts/aiscript/api.ts
index b6b7445b67..5453fe827d 100644
--- a/packages/frontend/src/scripts/aiscript/api.ts
+++ b/packages/frontend/src/scripts/aiscript/api.ts
@@ -11,6 +11,7 @@ export function createAiScriptEnv(opts) {
USER_NAME: $i ? values.STR($i.name) : values.NULL,
USER_USERNAME: $i ? values.STR($i.username) : values.NULL,
CUSTOM_EMOJIS: utils.jsToVal(customEmojis.value),
+ CURRENT_URL: values.STR(window.location.href),
'Mk:dialog': values.FN_NATIVE(async ([title, text, type]) => {
await os.alert({
type: type ? type.value : 'info',