FoundKeyGang/FoundKey
FoundKeyGang/FoundKey
7
19
Fork 22
Code Issues 37 Pull requests 4 Releases Activity

client: fix attached files and account switcher combination
All checks were successful
ci/woodpecker/push/lint-backend Pipeline was successful
Details
ci/woodpecker/push/lint-client Pipeline was successful
Details
ci/woodpecker/push/build Pipeline was successful
Details
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
Details
ci/woodpecker/push/lint-sw Pipeline was successful
Details
ci/woodpecker/push/test Pipeline was successful
Details

Browse source 
fixes #342

Changelog: Fixed
This commit is contained in:
Johann150 2023-02-18 12:30:45 +01:00
parent 0db3f1f8ed
commit 0cf8f78e23
Signed by: Johann150
GPG key ID: 9EE6577A2A06F8F1
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en-US.yml
View file

@ -710,6 +710,8 @@ botProtection: "Bot Protection"
instanceBlocking: "Blocked Instances" instanceBlocking: "Blocked Instances"
selectAccount: "Select account" selectAccount: "Select account"
switchAccount: "Switch account" switchAccount: "Switch account"
cannotAttachFileWhenAccountSwitched: "You cannot attach a file while switched to another account."
cannotSwitchAccountWhenFileAttached: "You cannot switch accounts while files are attached."
enabled: "Enabled" enabled: "Enabled"
disabled: "Disabled" disabled: "Disabled"
quickAction: "Quick actions" quickAction: "Quick actions"

16
packages/client/src/components/post-form.vue
View file

@ -7,7 +7,12 @@
> >
<header> <header>
<button v-if="!fixed" class="cancel _button" @click="cancel"><i class="fas fa-times"></i></button> <button v-if="!fixed" class="cancel _button" @click="cancel"><i class="fas fa-times"></i></button>
<button v-tooltip="i18n.ts.switchAccount" class="account _button" @click="openAccountMenu"> <button
v-tooltip="files.length > 0 ? i18n.ts.cannotSwitchAccountWhenFileAttached : i18n.ts.switchAccount"
:disabled="files.length > 0"
class="account _button"
@click="openAccountMenu"
>
<MkAvatar :user="postAccount ?? $i" class="avatar"/> <MkAvatar :user="postAccount ?? $i" class="avatar"/>
</button> </button>
<div> <div>
@ -45,7 +50,14 @@
<XPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/> <XPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
<XNotePreview v-if="showPreview" class="preview" :text="text"/> <XNotePreview v-if="showPreview" class="preview" :text="text"/>
<footer> <footer>
<button v-tooltip="i18n.ts.attachFile" class="_button" @click="chooseFileFrom"><i class="fas fa-photo-video"></i></button> <button
v-tooltip="postAccount != null ? i18n.ts.cannotAttachFileWhenAccountSwitched : i18n.ts.attachFile"
:disabled="postAccount != null"
class="_button"
@click="chooseFileFrom"
>
<i class="fas fa-photo-video"></i>
</button>
<button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="fas fa-poll-h"></i></button> <button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="fas fa-poll-h"></i></button>
<button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="fas fa-eye-slash"></i></button> <button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="fas fa-eye-slash"></i></button>
<button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="fas fa-at"></i></button> <button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="fas fa-at"></i></button>