Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance(frontend): CWの注釈テキストが入力されていない場合はPostボタンを非アクティブに #15639

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
+9 −9
Open

enhance(frontend): CWの注釈テキストが入力されていない場合はPostボタンを非アクティブに #15639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ad0f37
add condition to disable post button when CW text is empty
r-ca Mar 9, 2025
ed70d5d
standardize condition by using 1<= inserted of 0<
r-ca Mar 9, 2025
1bb118c
unify CW text length condition to improve readability
r-ca Mar 9, 2025
0b34450
add missing CW state check
r-ca Mar 9, 2025
4b40fa8
fix state check, add empty/null check, improve max length validation
r-ca Mar 9, 2025
3b4764f
simplify CW validation by removing minimum length check
r-ca Mar 9, 2025
10e0c2c
Update CHANGELOG
r-ca Mar 9, 2025
8c74ec0
remove CW text validation in post()
r-ca Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
- Feat: 設定の管理が強化されました
- 自動でバックアップされるように
- Enhance: プラグインの管理が強化されました
- Enhance: CWの注釈テキストが入力されていない場合, Postボタンを非アクティブに
- Enhance: CWを無効にした場合, 注釈テキストが最大入力文字数を超えていても投稿できるように

### Server
- Fix: プロフィール追加情報で無効なURLに入力された場合に照会エラーを出るのを修正
Expand Down
16 changes: 7 additions & 9 deletions packages/frontend/src/components/MkPostForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down Expand Up @@ -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;

Expand Down
Loading