summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-03-10 21:42:30 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2025-03-10 21:42:30 +0900
commit1f2801af02f1542212b2f2dc383bedf6fa987a86 (patch)
tree4231f66132c3ac90708e8a548df5223d24e2e520
parentchore(frontend): improve preference store stability (diff)
parentenhance(frontend): CWの注釈テキストが入力されていない場合... (diff)
downloadmisskey-1f2801af02f1542212b2f2dc383bedf6fa987a86.tar.gz
misskey-1f2801af02f1542212b2f2dc383bedf6fa987a86.tar.bz2
misskey-1f2801af02f1542212b2f2dc383bedf6fa987a86.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to '')
-rw-r--r--CHANGELOG.md2
-rw-r--r--package.json2
-rw-r--r--packages/frontend/src/components/MkPostForm.vue16
-rw-r--r--packages/misskey-js/package.json2
4 files changed, 11 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e3215dc6c..748f3aa8eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
- Feat: 設定の管理が強化されました
- 自動でバックアップされるように
- Enhance: プラグインの管理が強化されました
+- Enhance: CWの注釈テキストが入力されていない場合, Postボタンを非アクティブに
+- Enhance: CWを無効にした場合, 注釈テキストが最大入力文字数を超えていても投稿できるように
- Enhance: テーマ設定画面のデザインを改善
- Fix: テーマ切り替え時に一部の色が変わらない問題を修正
diff --git a/package.json b/package.json
index ff891ab9a4..70ff19ad4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.3.2-alpha.4",
+ "version": "2025.3.2-alpha.5",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 6a72663157..5e379d08b7 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -265,7 +265,13 @@ const canPost = computed((): boolean => {
quoteId.value != null
) &&
(textLength.value <= maxTextLength.value) &&
- (cwTextLength.value <= maxCwTextLength) &&
+ (
+ useCw.value ?
+ (
+ cw.value != null && cw.value.trim() !== '' &&
+ cwTextLength.value <= maxCwTextLength
+ ) : true
+ ) &&
(files.value.length <= 16) &&
(!poll.value || poll.value.choices.length >= 2);
});
@@ -744,14 +750,6 @@ function isAnnoying(text: string): boolean {
}
async function post(ev?: MouseEvent) {
- if (useCw.value && (cw.value == null || cw.value.trim() === '')) {
- os.alert({
- type: 'error',
- text: i18n.ts.cwNotationRequired,
- });
- return;
- }
-
if (ev) {
const el = (ev.currentTarget ?? ev.target) as HTMLElement | null;
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index d98d2f3ed1..0ca8b36732 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.3.2-alpha.4",
+ "version": "2025.3.2-alpha.5",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",